Skip to content

Commit

Permalink
update zapbox sdk
Browse files Browse the repository at this point in the history
fixes build issue on android, so removing the code that removed zapbox sdk on unsupported platforms.
  • Loading branch information
mikeskydev committed Nov 29, 2023
1 parent 05580fd commit d8d8e0e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,6 @@ jobs:
cp -R 'tmp.package/Assets/TextMesh Pro' Assets/
rm -rf tmp.plugin tmp.package
- name: Manually delete Zapbox package
if: matrix.vrsdk != 'Zapbox'
run: |
# Android builds fail on if Zapbox package is present
cat Packages/manifest.json | jq 'del( .dependencies ["com.zappar.xr.zapbox"] )' | tee Packages/manifest.json.new
mv Packages/manifest.json.new Packages/manifest.json
cat Packages/packages-lock.json | jq 'del( .dependencies ["com.zappar.xr.zapbox"] )' | tee Packages/packages-lock.json.new
mv Packages/packages-lock.json.new Packages/packages-lock.json
- name: Manually delete USD packages
if: matrix.targetPlatform == 'iOS'
run: |
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"com.unity.xr.management": "4.3.3",
"com.unity.xr.oculus": "3.3.0",
"com.unity.xr.openxr": "1.8.2",
"com.zappar.xr.zapbox": "https://github.com/zappar-xr/zapbox-xr-sdk.git#56128ef166149b29bb3451a7c67a39d4c888fa62",
"com.zappar.xr.zapbox": "https://github.com/zappar-xr/zapbox-xr-sdk.git#5c75594e81da13a5d54a8e33b983add57b884c50",
"org.nuget.google.apis": "1.57.0",
"org.nuget.google.apis.auth": "1.57.0",
"org.nuget.google.apis.core": "https://github.com/icosa-mirror/org.nuget.google.apis.core.git#unity-newtonsoft",
Expand Down
4 changes: 2 additions & 2 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,14 @@
"url": "https://packages.unity.com"
},
"com.zappar.xr.zapbox": {
"version": "https://github.com/zappar-xr/zapbox-xr-sdk.git#56128ef166149b29bb3451a7c67a39d4c888fa62",
"version": "https://github.com/zappar-xr/zapbox-xr-sdk.git#5c75594e81da13a5d54a8e33b983add57b884c50",
"depth": 0,
"source": "git",
"dependencies": {
"com.unity.xr.management": "3.2.9",
"com.unity.xr.legacyinputhelpers": "2.1.4"
},
"hash": "56128ef166149b29bb3451a7c67a39d4c888fa62"
"hash": "5c75594e81da13a5d54a8e33b983add57b884c50"
},
"org.nuget.google.apis": {
"version": "1.57.0",
Expand Down

0 comments on commit d8d8e0e

Please sign in to comment.