Update the tools to use Unity 2021

a-maurice · a-maurice · commit e31145b87fa7 · 2024-09-19T14:12:53.000-07:00
diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/build_starter.yml b/.github/workflows/build_starter.yml
@@ -12,7 +12,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2020'
+        default: '2021'
         required: true
       firebase_cpp_sdk_version:
         description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout). Required if for release'
@@ -103,7 +103,7 @@ jobs:
             echo "release_label=nightly-$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_OUTPUT
             echo "release_version=NoVersion" >> $GITHUB_OUTPUT
             echo "apis='analytics,app_check,auth,crashlytics,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'" >> $GITHUB_OUTPUT
-            echo "unity_version=2020" >> $GITHUB_OUTPUT
+            echo "unity_version=2021" >> $GITHUB_OUTPUT
             echo "should_trigger_package=true" >> $GITHUB_OUTPUT
             echo "firebase_cpp_sdk_version=" >> $GITHUB_OUTPUT
             echo "unity_branch=" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/build_tvos.yml b/.github/workflows/build_tvos.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
@@ -33,7 +33,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/generate_swig.yml b/.github/workflows/generate_swig.yml
@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2020'
+        default: '2021'
         required: true
         type: string
       firebase_cpp_sdk_version:
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -7,8 +7,8 @@ on:
       packaged_sdk_run_id:
         description: 'run # of "Firebase Unity SDK build" workflow. (If Leave it empty, the latest released Unity SDK will be used.)'
       unity_versions:
-        description: 'Unity version (value: 2018, 2019, 2020. separated by commas)'
-        default: '2020'
+        description: 'Unity version (value: 2021, 2022. separated by commas)'
+        default: '2021'
         required: true
       build_os:
         description: 'Build OS (value: windows-latest, macos-latest. Left empty will use macos-latest for iOS platform, windows-latest for the rest)'
diff --git a/gha/unity/README.md b/gha/unity/README.md
@@ -1,7 +1,7 @@
 # `unity-setup` GitHub Action
 
 ## Inputs
--  `version`: **[Required]** Unity Major Version Number. Currently supported values: [2019, 2020].
+-  `version`: **[Required]** Unity Major Version Number. Currently supported values: [2019, 2020, 2021, 2022].
 
 -  `platforms`: Platforms that you'd like to support, if not provided, build apps on certain platforms may encounter errors. Values: [Android,iOS,tvOS,Windows,macOS,Linux].
 
diff --git a/gha/unity/unity_installer.py b/gha/unity/unity_installer.py
@@ -122,6 +122,40 @@
   # e.g. https://unity3d.com/unity/whats-new/2020.3.34
   # The modules are required to build sepecific platforms.
   # The modules are valid only if Unity Hub & Unity are installed.
+  "2022": {
+    WINDOWS: {
+      "version": "2022.3.47f1",
+      "changeset": "88c277b85d21",
+      "modules": {ANDROID: ["android", "ios"], IOS: ["ios"], TVOS: ["appletv"], WINDOWS: [], MACOS: ["mac-mono"], LINUX: ["linux-mono"], PLAYMODE: ["ios"]},
+    },
+    MACOS: {
+      "version": "2022.3.47f1",
+      "changeset": "88c277b85d21",
+      "modules": {ANDROID: ["android"], IOS: ["ios", "appletv"], TVOS: ["appletv"], WINDOWS: ["windows-mono"], MACOS: ["ios"], LINUX: ["linux-mono"], PLAYMODE: []},
+    },
+    LINUX: {
+      "version": "2022.3.47f1",
+      "changeset": "88c277b85d21",
+      "modules": {ANDROID: ["android"], IOS: ["ios"], TVOS: [], WINDOWS: ["windows-mono"], MACOS: ["mac-mono"], LINUX: [], PLAYMODE: []}
+    }
+  },
+  "2021": {
+    WINDOWS: {
+      "version": "2021.3.43f1",
+      "changeset": "6f9470916942",
+      "modules": {ANDROID: ["android", "ios"], IOS: ["ios"], TVOS: ["appletv"], WINDOWS: [], MACOS: ["mac-mono"], LINUX: ["linux-mono"], PLAYMODE: ["ios"]},
+    },
+    MACOS: {
+      "version": "2021.3.43f1",
+      "changeset": "6f9470916942",
+      "modules": {ANDROID: ["android"], IOS: ["ios", "appletv"], TVOS: ["appletv"], WINDOWS: ["windows-mono"], MACOS: ["ios"], LINUX: ["linux-mono"], PLAYMODE: []},
+    },
+    LINUX: {
+      "version": "2021.3.43f1",
+      "changeset": "6f9470916942",
+      "modules": {ANDROID: ["android"], IOS: ["ios"], TVOS: [], WINDOWS: ["windows-mono"], MACOS: ["mac-mono"], LINUX: [], PLAYMODE: []}
+    }
+  },
   "2020": {
     WINDOWS: {
       "version": "2020.3.34f1",
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
@@ -503,6 +503,14 @@ def patch_android_env(unity_version):
   major_version = int(unity_version.split(".")[0])
   # Set ndk env
   UNITY_SETTINGS = {
+    "2022": {
+      _WINDOWS: "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip",
+      _MACOS: "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip",
+    },
+    "2021": {
+      _WINDOWS: "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip",
+      _MACOS: "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip",
+    },
     "2020": {
       _WINDOWS: "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip",
       _MACOS: "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip",
diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
@@ -62,7 +62,7 @@
 PARAMETERS = {
   "integration_tests": {
     "matrix": {
-      "unity_versions": ["2020"],
+      "unity_versions": ["2021"],
       "build_os": [""],
       "platforms": [WINDOWS, MACOS, LINUX, ANDROID, IOS, TVOS, PLAYMODE],
       "mobile_devices": ["android_target", "ios_target", "simulator_target", "tvos_simulator"],
@@ -74,7 +74,7 @@
 
       EXPANDED_KEY: {
         "build_os": [MACOS_RUNNER,WINDOWS_RUNNER],
-        "unity_versions": ["2020"],
+        "unity_versions": ["2021"],
         "mobile_test_on": ["real", "virtual"],
       }
     },
