chore: upgrade Unity version (#856)

* build: upgrade Unity version * skip cat * fix unity version on Windows
homuler · Feb 19, 2023 · 7679fad · 7679fad
1 parent 1a85630
commit 7679fad
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 59 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: 2021.3.3f1
+      placeholder: 2021.3.18f1
     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: 2021.3.3f1
+      placeholder: 2021.3.18f1
     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: 2021.3.3f1
+      placeholder: 2021.3.18f1
     validations:
       required: true
 

diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml
@@ -70,8 +70,8 @@ jobs:
           - ubuntu-20.04
           - ubuntu-18.04
         unityVersion:
-          - 2021.3.3f1
-          - 2020.3.36f1
+          - 2021.3.18f1
+          - 2020.3.44f1
     steps:
       - name: Install UnityEditor
         run: |
@@ -135,7 +135,6 @@ jobs:
             -enableCodeCoverage \
             -debugCodeOptimization \
             -coverageOptions 'generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+MediaPipe.Runtime;pathFilters:-*/Runtime/Scripts/Protobuf/*'
-          cat DummyProject/${ARTIFACTS_PATH}/results.xml
 
       - name: Cat results.xml
         env:

diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -58,8 +58,8 @@ jobs:
           - macos-11
           - macos-12
         unity:
-          - { version: "2021.3.3f1", changeset: "af2e63e8f9bd" }
-          - { version: "2020.3.36f1", changeset: "71f96b79b9f0" }
+          - { version: "2021.3.18f1", changeset: "3129e69bc0c7" }
+          - { version: "2020.3.44f1", changeset: "7f159b6136da" }
     steps:
       - name: Install UnityEditor
         run: |

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -197,7 +197,7 @@ jobs:
       - name: Install UnityEditor
         if: ${{ env.BUILD_UNITYPACKAGE == '1' }}
         run: |
-          sudo docker cp $(docker create --rm unityci/editor:2021.3.3f1-base-1):/opt/unity /opt/unity
+          sudo docker cp $(docker create --rm unityci/editor:2021.3.18f1-base-1):/opt/unity /opt/unity
           sudo chown -R $(id -u):$(id -g) /opt/unity
 
           echo -e '#!/bin/bash\nxvfb-run -ae /dev/stdout /opt/unity/Editor/Unity -batchmode "$@"' | sudo tee -a /usr/bin/unity-editor
@@ -219,7 +219,7 @@ jobs:
           npm install
           cd ..
           npm install -g ./unity-license-activate
-          unity-license-activate "$UNITY_EMAIL" "$UNITY_PASSWORD" Unity_v2021.3.3f1.alf --authenticator-key "$UNITY_TOTP_KEY"
+          unity-license-activate "$UNITY_EMAIL" "$UNITY_PASSWORD" Unity_v2021.3.18f1.alf --authenticator-key "$UNITY_TOTP_KEY"
           rm -rf unity-license-activate
       - name: Activate License
         if: ${{ env.BUILD_UNITYPACKAGE == '1' }}

diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -69,8 +69,8 @@ jobs:
         os:
           - windows-2019
         unity:
-          - { version: "2021.3.3f1", changeset: "af2e63e8f9bd" }
-          - { version: "2020.3.36f1", changeset: "71f96b79b9f0" }
+          - { version: "2021.3.18f1", changeset: "3129e69bc0c7" }
+          - { version: "2020.3.44f1", changeset: "7f159b6136da" }
     steps:
       - name: Install UnityHub
         uses: crazy-max/ghaction-chocolatey@v2
@@ -139,7 +139,6 @@ jobs:
             -runTests `
             -testPlatform EditMode `
             -testCategory !GpuOnly;!SignalAbort"
-          cat DummyProject\$env:ARTIFACTS_PATH\results.xml
           exit $process.ExitCode
 
       - name: Cat results.xml

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,20 +1,20 @@
 {
   "dependencies": {
-    "com.unity.2d.animation": "7.0.5",
-    "com.unity.2d.pixel-perfect": "5.0.1",
-    "com.unity.2d.psdimporter": "6.0.3",
+    "com.unity.2d.animation": "7.0.9",
+    "com.unity.2d.pixel-perfect": "5.0.3",
+    "com.unity.2d.psdimporter": "6.0.7",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "7.0.4",
+    "com.unity.2d.spriteshape": "7.0.6",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.collab-proxy": "1.15.16",
-    "com.unity.ide.rider": "3.0.14",
-    "com.unity.ide.visualstudio": "2.0.15",
+    "com.unity.collab-proxy": "2.0.0",
+    "com.unity.ide.rider": "3.0.18",
+    "com.unity.ide.visualstudio": "2.0.17",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.mathematics": "1.2.6",
     "com.unity.memoryprofiler": "0.7.1-preview.1",
     "com.unity.settings-manager": "1.0.3",
     "com.unity.test-framework": "1.1.31",
-    "com.unity.testtools.codecoverage": "1.0.1",
+    "com.unity.testtools.codecoverage": "1.2.2",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.toolchain.linux-x86_64": "0.1.18-preview",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -7,19 +7,19 @@
       "dependencies": {}
     },
     "com.unity.2d.animation": {
-      "version": "7.0.5",
+      "version": "7.0.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.common": "6.0.3",
+        "com.unity.2d.common": "6.0.6",
         "com.unity.2d.sprite": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
         "com.unity.modules.uielements": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.common": {
-      "version": "6.0.3",
+      "version": "6.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -38,19 +38,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.pixel-perfect": {
-      "version": "5.0.1",
+      "version": "5.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.psdimporter": {
-      "version": "6.0.3",
+      "version": "6.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.animation": "7.0.4",
-        "com.unity.2d.common": "6.0.3",
+        "com.unity.2d.animation": "7.0.9",
+        "com.unity.2d.common": "6.0.6",
         "com.unity.2d.sprite": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -62,12 +62,12 @@
       "dependencies": {}
     },
     "com.unity.2d.spriteshape": {
-      "version": "7.0.4",
+      "version": "7.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "6.0.3",
+        "com.unity.2d.common": "6.0.4",
         "com.unity.2d.path": "5.0.2",
         "com.unity.modules.physics2d": "1.0.0"
       },
@@ -80,7 +80,7 @@
       "dependencies": {}
     },
     "com.unity.burst": {
-      "version": "1.6.5",
+      "version": "1.6.6",
       "depth": 2,
       "source": "registry",
       "dependencies": {
@@ -89,12 +89,10 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.15.16",
+      "version": "2.0.0",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.0.1"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.editorcoroutines": {
@@ -112,7 +110,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.14",
+      "version": "3.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -121,7 +119,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.15",
+      "version": "2.0.17",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -152,24 +150,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.services.core": {
-      "version": "1.3.1",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.settings-manager": {
       "version": "1.0.3",
       "depth": 0,
@@ -205,7 +185,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.0.1",
+      "version": "1.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.3f1
-m_EditorVersionWithRevision: 2021.3.3f1 (af2e63e8f9bd)
+m_EditorVersion: 2021.3.18f1
+m_EditorVersionWithRevision: 2021.3.18f1 (3129e69bc0c7)
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MediaPipe Unity Plugin
 
-This is a Unity (2021.3.3f1) [Native Plugin](https://docs.unity3d.com/Manual/NativePlugins.html) to use [MediaPipe](https://github.com/google/mediapipe) (0.9.1).
+This is a Unity (2021.3.18f1) [Native Plugin](https://docs.unity3d.com/Manual/NativePlugins.html) to use [MediaPipe](https://github.com/google/mediapipe) (0.9.1).
 
 The goal of this project is to port the MediaPipe API (C++) _one by one_ to C# so that it can be called from Unity.\
 This approach may sacrifice performance when you need to call multiple APIs in a loop, but it gives you the flexibility to use MediaPipe instead.