Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade Unity version #856

Merged
merged 3 commits into from
Feb 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ body:
id: unity_version
attributes:
label: Unity Version
placeholder: 2021.3.3f1
placeholder: 2021.3.18f1
validations:
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/build-install-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ body:
id: unity_version
attributes:
label: Unity Version
placeholder: 2021.3.3f1
placeholder: 2021.3.18f1
validations:
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body:
id: unity_version
attributes:
label: Unity Version
placeholder: 2021.3.3f1
placeholder: 2021.3.18f1
validations:
required: true

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/linux-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/windows-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
50 changes: 15 additions & 35 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
Expand All @@ -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"
},
Expand All @@ -80,7 +80,7 @@
"dependencies": {}
},
"com.unity.burst": {
"version": "1.6.5",
"version": "1.6.6",
"depth": 2,
"source": "registry",
"dependencies": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down