diff --git a/.github/scripts/validate-unity-distribution.py b/.github/scripts/validate-unity-distribution.py index d13ed389..0afde3db 100644 --- a/.github/scripts/validate-unity-distribution.py +++ b/.github/scripts/validate-unity-distribution.py @@ -18,6 +18,7 @@ ) CORE_PACKAGE = PACKAGE_NAMES[0] MINIMUM_UNITY_VERSION = "2022.3" +MINIMUM_UNITY_RELEASE = "0f1" EXCLUDED_PREFIXES = ( "Assets/OneSignal/Attribution", @@ -85,6 +86,11 @@ def validate_packages() -> None: fail(f"{name} version does not match {CORE_PACKAGE}") if package.get("unity") != MINIMUM_UNITY_VERSION: fail(f"{name} does not support Unity {MINIMUM_UNITY_VERSION}") + if package.get("unityRelease") != MINIMUM_UNITY_RELEASE: + fail( + f"{name} does not support Unity " + f"{MINIMUM_UNITY_VERSION}.{MINIMUM_UNITY_RELEASE}" + ) if package.get("license") != "SEE LICENSE IN LICENSE.md": fail(f"{name} does not reference its package license") if not package.get("documentationUrl", "").startswith("https://"): diff --git a/com.onesignal.unitysdk.android/package.json b/com.onesignal.unitysdk.android/package.json index 65b1d06d..43b8aa7e 100644 --- a/com.onesignal.unitysdk.android/package.json +++ b/com.onesignal.unitysdk.android/package.json @@ -3,6 +3,7 @@ "displayName": "OneSignal SDK Android", "version": "6.0.0", "unity": "2022.3", + "unityRelease": "0f1", "description": "Android platform implementation for the OneSignal Unity SDK, including native dependency resolution and notification resources.", "dependencies": { "com.onesignal.unitysdk.core": "6.0.0" diff --git a/com.onesignal.unitysdk.core/package.json b/com.onesignal.unitysdk.core/package.json index 20596c8d..616ad100 100644 --- a/com.onesignal.unitysdk.core/package.json +++ b/com.onesignal.unitysdk.core/package.json @@ -3,6 +3,7 @@ "displayName": "OneSignal SDK Core", "version": "6.0.0", "unity": "2022.3", + "unityRelease": "0f1", "description": "Core APIs, editor setup, and shared runtime for the OneSignal Unity SDK. Install the Android and/or iOS package for native platform support.", "dependencies": { "com.unity.modules.jsonserialize": "1.0.0" diff --git a/com.onesignal.unitysdk.ios/package.json b/com.onesignal.unitysdk.ios/package.json index 9bf69009..adf17ed5 100644 --- a/com.onesignal.unitysdk.ios/package.json +++ b/com.onesignal.unitysdk.ios/package.json @@ -3,6 +3,7 @@ "displayName": "OneSignal SDK iOS", "version": "6.0.0", "unity": "2022.3", + "unityRelease": "0f1", "description": "iOS platform implementation for the OneSignal Unity SDK, including the native bridge, CocoaPods dependencies, and Xcode post-processing.", "dependencies": { "com.onesignal.unitysdk.core": "6.0.0" diff --git a/examples/demo/Packages/manifest.json b/examples/demo/Packages/manifest.json index da1eb85f..33fe03ca 100644 --- a/examples/demo/Packages/manifest.json +++ b/examples/demo/Packages/manifest.json @@ -4,6 +4,7 @@ "com.onesignal.unitysdk.core": "file:../../../com.onesignal.unitysdk.core", "com.onesignal.unitysdk.ios": "file:../../../com.onesignal.unitysdk.ios", "com.unity.nuget.newtonsoft-json": "3.2.2", + "com.unity.upm-publishing-tools": "0.3.1", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" diff --git a/examples/demo/Packages/packages-lock.json b/examples/demo/Packages/packages-lock.json index 394d0fd6..213d68af 100644 --- a/examples/demo/Packages/packages-lock.json +++ b/examples/demo/Packages/packages-lock.json @@ -31,6 +31,23 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.sharp-zip-lib": { + "version": "1.4.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.upm-publishing-tools": { + "version": "0.3.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sharp-zip-lib": "1.4.1", + "com.unity.nuget.newtonsoft-json": "3.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.modules.androidjni": { "version": "1.0.0", "depth": 0, diff --git a/examples/demo/ProjectSettings/PackageManagerSettings.asset b/examples/demo/ProjectSettings/PackageManagerSettings.asset index 9d4f17ea..f9fdc8c7 100644 --- a/examples/demo/ProjectSettings/PackageManagerSettings.asset +++ b/examples/demo/ProjectSettings/PackageManagerSettings.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_SeeAllPackageVersions: 0 m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 1 + oneTimePackageErrorsPopUpShown: 0 m_Registries: - m_Id: main m_Name: @@ -26,19 +27,16 @@ MonoBehaviour: m_IsDefault: 1 m_Capabilities: 7 m_ConfigSource: 0 - - m_Id: scoped:project:npmjs - m_Name: npmjs - m_Url: https://registry.npmjs.org - m_Scopes: - - com.onesignal - m_IsDefault: 0 - m_Capabilities: 0 - m_ConfigSource: 4 - m_UserSelectedRegistryName: npmjs + m_Compliance: + m_Status: 0 + m_Violations: [] + m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -840 - m_OriginalInstanceId: -844 + m_UserModificationsEntityId: + m_Data: -922 + m_OriginalEntityId: + m_Data: -926 m_LoadAssets: 0