Merge pull request #601 from immutable/chore/unity6-android

chore: unity 6 sample android app, update unity 6 version in github actions

Author: nattb8

.github/workflows/test-build.yml

@@ -60,7 +60,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
-          unityVersion: 6000.0.58f1
+          unityVersion: 6000.0.58f2
           projectPath: './sample-unity6'
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           testMode: 'EditMode'
@@ -131,6 +131,7 @@ jobs:
       matrix:
         targetPlatform:
           - iOS
+          - Android
     steps:
       - uses: actions/checkout@v4
         with:
@@ -150,7 +151,7 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
-          unityVersion: 6000.0.58f1
+          unityVersion: 6000.0.58f2
           targetPlatform: ${{ matrix.targetPlatform }}
           projectPath: sample-unity6
       - uses: actions/upload-artifact@v4

.github/workflows/ui-tests.yml

@@ -110,7 +110,7 @@ jobs:
           export TMPDIR="/Users/svc_buildsdk/tmp"
           mkdir -p "$TMPDIR"
           mkdir -p sample-unity6/Tests
-          /Applications/Unity/Hub/Editor/6000.0.58f1/Unity.app/Contents/MacOS/Unity -projectPath "${{ github.workspace }}/sample-unity6" -executeMethod "MacBuilderUnity6.BuildForAltTester" -logFile "${{ github.workspace }}/sample-unity6/first-build-log.txt" -quit -batchmode --buildPath "${{ github.workspace }}/sample-unity6/Tests/Sample Unity 6 macOS" || true
+          /Applications/Unity/Hub/Editor/6000.0.58f2/Unity.app/Contents/MacOS/Unity -projectPath "${{ github.workspace }}/sample-unity6" -executeMethod "MacBuilderUnity6.BuildForAltTester" -logFile "${{ github.workspace }}/sample-unity6/first-build-log.txt" -quit -batchmode --buildPath "${{ github.workspace }}/sample-unity6/Tests/Sample Unity 6 macOS" || true
           
           echo "First build completed (may have failed, that's ok). Checking for AltTester..."
           if ls -la "${{ github.workspace }}/sample-unity6/Library/PackageCache/" | grep alttester; then
@@ -124,7 +124,7 @@ jobs:
           export TMPDIR="/Users/svc_buildsdk/tmp"
           mkdir -p "$TMPDIR"
           mkdir -p sample-unity6/Tests
-          /Applications/Unity/Hub/Editor/6000.0.58f1/Unity.app/Contents/MacOS/Unity -projectPath "${{ github.workspace }}/sample-unity6" -executeMethod "MacBuilderUnity6.BuildForAltTester" -logFile "${{ github.workspace }}/sample-unity6/build-log.log" -quit -batchmode --buildPath "${{ github.workspace }}/sample-unity6/Tests/Sample Unity 6 macOS"
+          /Applications/Unity/Hub/Editor/6000.0.58f2/Unity.app/Contents/MacOS/Unity -projectPath "${{ github.workspace }}/sample-unity6" -executeMethod "MacBuilderUnity6.BuildForAltTester" -logFile "${{ github.workspace }}/sample-unity6/build-log.log" -quit -batchmode --buildPath "${{ github.workspace }}/sample-unity6/Tests/Sample Unity 6 macOS"
           
           echo "Build completed. Checking for build output..."
           ls -la sample-unity6/Tests/

.gitignore

@@ -32,6 +32,9 @@
 # Gradle cache directory
 .gradle/
 
+# Unity Android temporary build files
+.utmp/
+
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/

sample-unity6/Assets/Plugins.meta

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+        </activity>
+        <activity
+            android:name="com.immutable.unity.RedirectActivity"
+            android:exported="true" >
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="callback" android:scheme="immutablerunner" />
+                <data android:host="logout" android:scheme="immutablerunner" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

sample-unity6/Assets/Plugins/Android.meta

@@ -0,0 +1,47 @@
+apply plugin: 'com.android.library'
+apply from: '../shared/keepUnitySymbols.gradle'
+**APPLY_PLUGINS**
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation('androidx.browser:browser:1.5.0')
+**DEPS**}
+
+android {
+    namespace "com.unity3d.player"
+    ndkPath "**NDKPATH**"
+    ndkVersion "**NDKVERSION**"
+
+    compileSdk **APIVERSION**
+    buildToolsVersion = "**BUILDTOOLS**"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        minSdk **MINSDK**
+        targetSdk **TARGETSDK**
+        ndk {
+            abiFilters **ABIFILTERS**
+            debugSymbolLevel **DEBUGSYMBOLLEVEL**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+**DEFAULT_CONFIG_SETUP**
+    }
+
+    lint {
+        abortOnError false
+    }
+
+    androidResources {
+        noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**PACKAGING**
+}
+**IL_CPP_BUILD_SETUP**
+**SOURCE_BUILD_SETUP**
+**EXTERNAL_SOURCES**

sample-unity6/Assets/Plugins/Android/AndroidManifest.xml

@@ -0,0 +1,7 @@
+-dontwarn com.immutable.**
+-keep class com.immutable.** { *; }
+-keep interface com.immutable.** { *; }
+
+-dontwarn androidx.**
+-keep class androidx.** { *; }
+-keep interface androidx.** { *; }