build: Unity 6 (#1299)

* build: update Unity version to 6 * ci: update test environments * build: update mainTemplate.gradle
homuler · Jan 11, 2025 · 524455c · 524455c
1 parent 3efd495
commit 524455c
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 76 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -24,7 +24,7 @@ body:
     id: unity_version
     attributes:
       label: Unity Version
-      placeholder: 2022.3.34f1
+      placeholder: 6000.0.33f1
     validations:
       required: true
 

diff --git a/.github/ISSUE_TEMPLATE/build-install-issue.yml b/.github/ISSUE_TEMPLATE/build-install-issue.yml
@@ -24,7 +24,7 @@ body:
     id: unity_version
     attributes:
       label: Unity Version
-      placeholder: 2022.3.34f1
+      placeholder: 6000.0.33f1
     validations:
       required: true
 

diff --git a/.github/ISSUE_TEMPLATE/support.yml b/.github/ISSUE_TEMPLATE/support.yml
@@ -25,7 +25,7 @@ body:
     id: unity_version
     attributes:
       label: Unity Version
-      placeholder: 2022.3.34f1
+      placeholder: 6000.0.33f1
     validations:
       required: true
 

diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml
@@ -106,7 +106,8 @@ jobs:
         os:
           - ubuntu-24.04
         unityVersion:
-          - 2022.3.34f1
+          - 6000.0.33f1
+          - 2022.3.55f1
     steps:
       - name: Install UnityEditor
         run: |

diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -98,7 +98,8 @@ jobs:
         os:
           - macos-13
         unity:
-          - { version: "2022.3.34f1", changeset: "4886f5360533" }
+          - { version: "6000.0.33f1", changeset: "433b0a79340b" }
+          - { version: "2022.3.55f1", changeset: "9f374180d209" }
     steps:
       - name: Install UnityEditor
         run: |

diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -92,7 +92,8 @@ jobs:
         os:
           - windows-2019
         unity:
-          - { version: "2022.3.34f1", changeset: "4886f5360533" }
+          - { version: "6000.0.33f1", changeset: "433b0a79340b" }
+          - { version: "2022.3.55f1", changeset: "9f374180d209" }
     steps:
       - name: Install UnityHub
         uses: crazy-max/ghaction-chocolatey@v3

diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
@@ -1,40 +1,45 @@
 apply plugin: 'com.android.library'
+apply from: '../shared/keepUnitySymbols.gradle'
 **APPLY_PLUGINS**
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 **DEPS**}
 
 android {
+    namespace "com.unity3d.player"
     ndkPath "**NDKPATH**"
+    ndkVersion "**NDKVERSION**"
 
-    compileSdkVersion **APIVERSION**
-    buildToolsVersion '**BUILDTOOLS**'
+    compileSdk **APIVERSION**
+    buildToolsVersion = "**BUILDTOOLS**"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
-        minSdkVersion **MINSDKVERSION**
-        targetSdkVersion **TARGETSDKVERSION**
+        minSdk **MINSDK**
+        targetSdk **TARGETSDK**
         ndk {
             abiFilters **ABIFILTERS**
+            debugSymbolLevel **DEBUGSYMBOLLEVEL**
         }
         versionCode **VERSIONCODE**
         versionName '**VERSIONNAME**'
         consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+**DEFAULT_CONFIG_SETUP**
     }
 
-    lintOptions {
+    lint {
         abortOnError false
     }
 
-    aaptOptions {
+    androidResources {
         noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
         ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
-    }**PACKAGING_OPTIONS**
+    }**PACKAGING**
 
     // Include libc++_shared.so
     task copyLibcppShared(type: Copy) {

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,25 +1,26 @@
 {
   "dependencies": {
-    "com.unity.2d.animation": "9.1.1",
+    "com.unity.2d.animation": "10.1.4",
     "com.unity.2d.pixel-perfect": "5.0.3",
-    "com.unity.2d.psdimporter": "8.0.5",
+    "com.unity.2d.psdimporter": "9.0.3",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "9.0.3",
+    "com.unity.2d.spriteshape": "10.0.7",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ai.navigation": "1.1.5",
-    "com.unity.collab-proxy": "2.3.1",
-    "com.unity.ide.rider": "3.0.28",
+    "com.unity.ai.navigation": "2.0.5",
+    "com.unity.collab-proxy": "2.6.0",
+    "com.unity.ide.rider": "3.0.31",
     "com.unity.ide.visualstudio": "2.0.22",
-    "com.unity.mathematics": "1.2.6",
-    "com.unity.memoryprofiler": "1.1.0",
+    "com.unity.mathematics": "1.3.2",
+    "com.unity.memoryprofiler": "1.1.1",
+    "com.unity.multiplayer.center": "1.0.0",
     "com.unity.settings-manager": "2.0.1",
-    "com.unity.test-framework": "1.1.33",
-    "com.unity.testtools.codecoverage": "1.2.5",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.6",
-    "com.unity.toolchain.linux-x86_64": "2.0.4",
-    "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.test-framework": "1.4.5",
+    "com.unity.testtools.codecoverage": "1.2.6",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.linux-x86_64": "2.0.10",
+    "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",