Support Unity 2022.3 across SDK and demo (#886)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Fadi George <fadi-george@users.noreply.github.com>

Author: fadi-george

.github/workflows/e2e.yml

@@ -42,6 +42,19 @@ jobs:
           onesignal-app-id: ${{ vars.APPIUM_ONESIGNAL_APP_ID }}
           onesignal-api-key: ${{ secrets.APPIUM_ONESIGNAL_API_KEY }}
 
+      - name: Enable E2E accessibility
+        run: |
+          python3 - <<'PY'
+          import json
+          from pathlib import Path
+
+          path = Path("examples/demo/Packages/manifest.json")
+          manifest = json.loads(path.read_text())
+          manifest["dependencies"]["com.unity.modules.accessibility"] = "1.0.0"
+          path.write_text(json.dumps(manifest, indent=2) + "\n")
+          PY
+          printf '%s\n' '-define:ONESIGNAL_E2E_ACCESSIBILITY' > examples/demo/Assets/csc.rsp
+
       - name: Resolve OneSignal Android SDK version
         id: android-sdk-version
         run: |
@@ -61,7 +74,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: examples/demo/Library
-          key: unity-library-android-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/ProjectSettings/ProjectVersion.txt') }}
+          key: unity-library-android-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/Assets/csc.rsp', 'examples/demo/ProjectSettings/ProjectVersion.txt') }}
           restore-keys: unity-library-android-
 
       - name: Build APK
@@ -72,7 +85,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           projectPath: examples/demo
-          unityVersion: auto
+          unityVersion: 6000.4.11f1
           targetPlatform: Android
           buildMethod: BuildScript.BuildAndroidEmulator
           allowDirtyBuild: true
@@ -108,11 +121,24 @@ jobs:
           onesignal-app-id: ${{ vars.APPIUM_ONESIGNAL_APP_ID }}
           onesignal-api-key: ${{ secrets.APPIUM_ONESIGNAL_API_KEY }}
 
+      - name: Enable E2E accessibility
+        run: |
+          python3 - <<'PY'
+          import json
+          from pathlib import Path
+
+          path = Path("examples/demo/Packages/manifest.json")
+          manifest = json.loads(path.read_text())
+          manifest["dependencies"]["com.unity.modules.accessibility"] = "1.0.0"
+          path.write_text(json.dumps(manifest, indent=2) + "\n")
+          PY
+          printf '%s\n' '-define:ONESIGNAL_E2E_ACCESSIBILITY' > examples/demo/Assets/csc.rsp
+
       - name: Cache Unity Library
         uses: actions/cache@v5
         with:
           path: examples/demo/Library
-          key: unity-library-ios-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/ProjectSettings/ProjectVersion.txt') }}
+          key: unity-library-ios-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/Assets/csc.rsp', 'examples/demo/ProjectSettings/ProjectVersion.txt') }}
           restore-keys: unity-library-ios-
 
       - name: Cache Xcode DerivedData
@@ -123,7 +149,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: examples/demo/Build/iOS-DerivedData
-          key: deriveddata-${{ runner.os }}-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/ProjectSettings/ProjectVersion.txt', 'examples/demo/ProjectSettings/ProjectSettings.asset', 'com.onesignal.unity.ios/Editor/**', 'com.onesignal.unity.core/Editor/**', 'examples/demo/iOS/ExportOptions.plist') }}
+          key: deriveddata-${{ runner.os }}-${{ hashFiles('examples/demo/Packages/manifest.json', 'examples/demo/Assets/csc.rsp', 'examples/demo/ProjectSettings/ProjectVersion.txt', 'examples/demo/ProjectSettings/ProjectSettings.asset', 'com.onesignal.unity.ios/Editor/**', 'com.onesignal.unity.core/Editor/**', 'examples/demo/iOS/ExportOptions.plist') }}
           restore-keys: deriveddata-${{ runner.os }}-
 
       - name: Export Xcode project from Unity
@@ -134,7 +160,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           projectPath: examples/demo
-          unityVersion: auto
+          unityVersion: 6000.4.11f1
           targetPlatform: iOS
           buildMethod: BuildScript.BuildiOSDevice
           allowDirtyBuild: true

README.md

@@ -47,7 +47,7 @@ And via many additional platforms. [Check them all out](https://documentation.on
 ## Requirements
 - A [OneSignal Account](https://app.onesignal.com/signup) if you do not already have one
 - Your OneSignal App ID which you can find under **Settings > Keys & IDs**
-- Unity 2021.3 or newer
+- Unity 2022.3 or newer
 - Android Builds: Target API Level 33 or higher
 - iOS Builds: CocoaPods 1.11.3 or newer
 - In order to test push notifications you will need

com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.cs

@@ -37,6 +37,9 @@ internal static class OneSignalAndroidDependencies
     {
         static OneSignalAndroidDependencies()
         {
+            if (AssetDatabase.IsAssetImportWorkerProcess())
+                return;
+
             OneSignalSDKSettings.Changed += WriteDependencies;
             WriteDependencies();
         }

com.onesignal.unity.android/package.json

@@ -2,7 +2,7 @@
   "name": "com.onesignal.unity.android",
   "displayName": "OneSignal Unity SDK - Android",
   "version": "5.3.0",
-  "unity": "2021.3",
+  "unity": "2022.3",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
     "com.onesignal.unity.core": "5.3.0"

com.onesignal.unity.core/package.json

@@ -2,7 +2,7 @@
   "name": "com.onesignal.unity.core",
   "displayName": "OneSignal Unity SDK - Core",
   "version": "5.3.0",
-  "unity": "2021.3",
+  "unity": "2022.3",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
   },

com.onesignal.unity.ios/Editor/OneSignaliOSDependencies.cs

@@ -37,6 +37,9 @@ internal static class OneSignaliOSDependencies
     {
         static OneSignaliOSDependencies()
         {
+            if (AssetDatabase.IsAssetImportWorkerProcess())
+                return;
+
             OneSignalSDK.OneSignalSDKSettings.Changed += WriteDependencies;
             WriteDependencies();
         }

com.onesignal.unity.ios/package.json

@@ -2,7 +2,7 @@
   "name": "com.onesignal.unity.ios",
   "displayName": "OneSignal Unity SDK - iOS",
   "version": "5.3.0",
-  "unity": "2021.3",
+  "unity": "2022.3",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
     "com.onesignal.unity.core": "5.3.0"

examples/demo/Assets/OneSignal/Editor/OneSignalFileInventory.cs

@@ -47,7 +47,9 @@ internal sealed class OneSignalFileInventory : ScriptableObject
         public static string[] GetCurrentPaths() =>
             ConvertPathsToUnix(
                 Directory.GetFiles(PackageAssetsPath, "*", SearchOption.AllDirectories)
-            );
+            )
+                .Except(GeneratedDependencyPaths)
+                .ToArray();
 
         /// <summary>
         /// Makes sure <see cref="paths"/> are using forward slash to be Unix compatible.
@@ -75,5 +77,22 @@ public static string[] ConvertPathsToUnix(string[] paths)
             "Resources"
         );
         public static readonly string AssetPath = Path.Combine(EditorResourcesPath, AssetName);
+        private static readonly string[] GeneratedDependencyPaths = ConvertPathsToUnix(
+            new[]
+            {
+                Path.Combine(
+                    PackageAssetsPath,
+                    "Editor",
+                    "OneSignalAndroidDependencies.xml"
+                ),
+                Path.Combine(
+                    PackageAssetsPath,
+                    "Editor",
+                    "OneSignalAndroidDependencies.xml.meta"
+                ),
+                Path.Combine(PackageAssetsPath, "Editor", "OneSignaliOSDependencies.xml"),
+                Path.Combine(PackageAssetsPath, "Editor", "OneSignaliOSDependencies.xml.meta"),
+            }
+        );
     }
 }

examples/demo/Assets/OneSignal/README.md

@@ -32,7 +32,7 @@ And via many additional platforms. [Check them all out](https://documentation.on
 ## Requirements
 - A [OneSignal Account](https://app.onesignal.com/signup) if you do not already have one
 - Your OneSignal App ID which you can find under **Settings > Keys & IDs**
-- Unity 2021.3 or newer
+- Unity 2022.3 or newer
 - Android Builds: Target API Level 33 or higher
 - iOS Builds: CocoaPods 1.11.3 or newer
 - In order to test push notifications you will need

examples/demo/Assets/Scripts/Services/AccessibilityBridge.cs

@@ -4,7 +4,9 @@
 using System.Globalization;
 using System.Reflection;
 using UnityEngine;
+#if UNITY_2023_2_OR_NEWER && ONESIGNAL_E2E_ACCESSIBILITY
 using UnityEngine.Accessibility;
+#endif
 using UnityEngine.UIElements;
 
 namespace OneSignalDemo.Services
@@ -15,6 +17,7 @@ namespace OneSignalDemo.Services
     /// </summary>
     public class AccessibilityBridge : MonoBehaviour
     {
+#if UNITY_2023_2_OR_NEWER && ONESIGNAL_E2E_ACCESSIBILITY
         // GeometryChangedEvent is the hot path; this tick catches drift from sources that
         // don't raise it (animation curves, opacity tweens, value mutations).
         private const float FrameRefreshIntervalSeconds = 0.05f;
@@ -912,6 +915,19 @@ public IosInfoTap(Func<bool> isEnabled, Action action)
                 Action = action;
             }
         }
+#endif
+#else
+        public static void EnableForE2E(VisualElement root) { }
+
+        public static void RegisterE2ETapTarget(
+            VisualElement target,
+            Func<bool> isEnabled,
+            Action action
+        ) { }
+
+        public static void RequestResync() { }
+
+        public static void RequestImmediateResync() { }
 #endif
     }
 }