From 3ad9e2b728eb0dc62dec808c1e12fa96aabed880 Mon Sep 17 00:00:00 2001 From: Adam Szofran Date: Tue, 1 Oct 2024 11:37:45 -0700 Subject: [PATCH] Merge branch 'main_internal' --- .../Assets/Apple.Accessibility/package.json | 2 +- .../Apple.Core_Unity/Assets/Apple.Core/CHANGELOG.md | 4 ++++ .../Assets/Apple.Core/Editor/AppleNativeLibrary.cs | 2 +- .../Assets/Apple.Core/Editor/AppleUnityPackage.cs | 2 +- .../Apple.Core_Unity/Assets/Apple.Core/package.json | 2 +- plug-ins/Apple.Core/Native/Core.xcconfig | 2 +- .../Assets/Apple.CoreHaptics/package.json | 2 +- .../Assets/Apple.GameController/package.json | 2 +- .../Apple.GameKit_Unity/Assets/Apple.GameKit/package.json | 2 +- plug-ins/Apple.PHASE/Apple.PHASE_Unity/Assets/package.json | 2 +- 10 files changed, 13 insertions(+), 9 deletions(-) diff --git a/plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/package.json b/plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/package.json index 44be83b4..85637881 100644 --- a/plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/package.json +++ b/plug-ins/Apple.Accessibility/Apple.Accessibility_Unity/Assets/Apple.Accessibility/package.json @@ -5,7 +5,7 @@ "description": "A Unity-port of Apple's UIAccessibility protocol from UIKit.framework", "unity": "2022.3", "dependencies": { - "com.apple.unityplugin.core": "3.1.4" + "com.apple.unityplugin.core": "3.1.5" }, "keywords": [ "accessibility", diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/CHANGELOG.md b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/CHANGELOG.md index e923f5f0..b9a67102 100644 --- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/CHANGELOG.md +++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG All notable changes to this project will be documented in this file. +## [3.1.5] - 2024-10-01 +### Fixed +- Fixed a bug in the Apple.Core editor scripts that failed loading of plug-ins that were built for only a single platform. + ## [3.1.4] - 2024-09-05 ### Added - NSData.InitWithBytes() to create an NSData instance from a byte array. diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleNativeLibrary.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleNativeLibrary.cs index b1dd1923..0de5a4cd 100644 --- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleNativeLibrary.cs +++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleNativeLibrary.cs @@ -22,7 +22,7 @@ public enum LibraryType } /// - /// Construct an AppleNativeLibrary object using it's filename, debug symbols filename, and full path. + /// Construct an AppleNativeLibrary object using its filename, debug symbols filename, and full path. /// /// The library's name including extension. /// The debug symbols filename, including dSYM extension diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleUnityPackage.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleUnityPackage.cs index 85972f14..b0857efa 100644 --- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleUnityPackage.cs +++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleUnityPackage.cs @@ -44,7 +44,7 @@ public AppleUnityPackage(string name, string displayName, string packageSystemPa // Verified a valid config, create an inner dictionary for this config _nativeLibraryCollection[configFolderName] = new Dictionary(); string[] platformPaths = Directory.GetDirectories(currConfigPath); - if (platformPaths.Length > 1) + if (platformPaths.Length > 0) { foreach (string currPlatformPath in platformPaths) { diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/package.json b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/package.json index 6e492bdf..411fa1fd 100644 --- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/package.json +++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/package.json @@ -2,7 +2,7 @@ "name": "com.apple.unityplugin.core", "displayName": "Apple.Core", "description": "Provides project settings, post-build automation tools, and other shared functionality for Apple Unity Plug-ins.", - "version": "3.1.4", + "version": "3.1.5", "unity": "2022.3", "keywords": [ "apple" diff --git a/plug-ins/Apple.Core/Native/Core.xcconfig b/plug-ins/Apple.Core/Native/Core.xcconfig index 26b2b138..191cbdce 100644 --- a/plug-ins/Apple.Core/Native/Core.xcconfig +++ b/plug-ins/Apple.Core/Native/Core.xcconfig @@ -25,7 +25,7 @@ NATIVE_LIBRARY_ROOT_FOLDER_NAME=Apple.Core // ------------------ GENERATE_INFOPLIST_FILE = YES -CURRENT_PROJECT_VERSION = 3.1.4 +CURRENT_PROJECT_VERSION = 3.1.5 MARKETING_VERSION = $CURRENT_PROJECT_VERSION VERSIONING_SYSTEM = apple-generic INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 - 2024 Apple, Inc. All rights reserved." diff --git a/plug-ins/Apple.CoreHaptics/Apple.CoreHaptics_Unity/Assets/Apple.CoreHaptics/package.json b/plug-ins/Apple.CoreHaptics/Apple.CoreHaptics_Unity/Assets/Apple.CoreHaptics/package.json index 15ef4cce..fa73e6b0 100644 --- a/plug-ins/Apple.CoreHaptics/Apple.CoreHaptics_Unity/Assets/Apple.CoreHaptics/package.json +++ b/plug-ins/Apple.CoreHaptics/Apple.CoreHaptics_Unity/Assets/Apple.CoreHaptics/package.json @@ -5,7 +5,7 @@ "description": "Apple's CoreHaptics.framework ported to Unity", "unity": "2022.3", "dependencies": { - "com.apple.unityplugin.core": "3.1.4" + "com.apple.unityplugin.core": "3.1.5" }, "keywords": [ "haptics", diff --git a/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/package.json b/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/package.json index df318873..2e5b6d4c 100644 --- a/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/package.json +++ b/plug-ins/Apple.GameController/Apple.GameController_Unity/Assets/Apple.GameController/package.json @@ -5,7 +5,7 @@ "version": "1.2.2", "unity": "2022.3", "dependencies": { - "com.apple.unityplugin.core": "3.1.4" + "com.apple.unityplugin.core": "3.1.5" }, "keywords": [ "controller", diff --git a/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/package.json b/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/package.json index ceef6d15..2528817b 100644 --- a/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/package.json +++ b/plug-ins/Apple.GameKit/Apple.GameKit_Unity/Assets/Apple.GameKit/package.json @@ -5,7 +5,7 @@ "version": "3.0.0", "unity": "2022.3", "dependencies": { - "com.apple.unityplugin.core": "3.1.4" + "com.apple.unityplugin.core": "3.1.5" }, "keywords": [ "gamekit", diff --git a/plug-ins/Apple.PHASE/Apple.PHASE_Unity/Assets/package.json b/plug-ins/Apple.PHASE/Apple.PHASE_Unity/Assets/package.json index f2c7acfd..f6189d01 100644 --- a/plug-ins/Apple.PHASE/Apple.PHASE_Unity/Assets/package.json +++ b/plug-ins/Apple.PHASE/Apple.PHASE_Unity/Assets/package.json @@ -5,7 +5,7 @@ "version": "1.2.1", "unity": "2022.3", "dependencies": { - "com.apple.unityplugin.core": "3.1.4" + "com.apple.unityplugin.core": "3.1.5" }, "keywords": [ "audio",