Update project to 2021.3.36f1

simdsoft · Mar 28, 2024 · c6116a0 · c6116a0
1 parent 92b1ba7
commit c6116a0
Show file tree

Hide file tree

Showing 23 changed files with 375 additions and 185 deletions.
diff --git a/Assets/Plugins/Android/libs/arm64-v8a.meta b/Assets/Plugins/Android/libs/arm64-v8a.meta
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libyasio.so b/Assets/Plugins/Android/libs/arm64-v8a/libyasio.so
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libyasio.so.meta b/Assets/Plugins/Android/libs/arm64-v8a/libyasio.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a.meta b/Assets/Plugins/Android/libs/armeabi-v7a.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libyasio.so b/Assets/Plugins/Android/libs/armeabi-v7a/libyasio.so
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libyasio.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libyasio.so.meta
diff --git a/Assets/Plugins/Android/libs/x86.meta b/Assets/Plugins/Android/libs/x86.meta
diff --git a/Assets/Plugins/Android/libs/x86/libyasio.so b/Assets/Plugins/Android/libs/x86/libyasio.so
diff --git a/Assets/Plugins/Android/libs/x86/libyasio.so.meta b/Assets/Plugins/Android/libs/x86/libyasio.so.meta
diff --git a/Assets/Plugins/Android/normal/arm64-v8a/libyasio.so b/Assets/Plugins/Android/normal/arm64-v8a/libyasio.so
diff --git a/Assets/Plugins/Android/normal/armeabi-v7a/libyasio.so b/Assets/Plugins/Android/normal/armeabi-v7a/libyasio.so
diff --git a/Assets/Plugins/Android/normal/x86/libyasio.so b/Assets/Plugins/Android/normal/x86/libyasio.so
diff --git a/Assets/Plugins/x86_64/libyasio.so.meta b/Assets/Plugins/x86_64/libyasio.so.meta
diff --git a/Assets/Plugins/x86_64/yasio.dll.meta b/Assets/Plugins/x86_64/yasio.dll.meta
diff --git a/Assets/Plugins/yasio.bundle.meta b/Assets/Plugins/yasio.bundle.meta
diff --git a/NativeLibs/yasio/build_android.sh b/NativeLibs/yasio/build_android.sh
@@ -21,9 +21,7 @@ function build() {
     cmake -H. -B${BUILD_PATH} -DANDROID_ABI=${ABI} -DYASIO_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DYASIO_NO_DEPS=ON -DYASIO_ENABLE_NI=ON -DYASIO_ENABLE_KCP=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${NDK}/build/cmake/android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=${API} -DANDROID_TOOLCHAIN=clang -DANDROID_TOOLCHAIN_NAME=${TOOLCHAIN_ANME}
     cmake --build ${BUILD_PATH} --config Release
     mkdir -p plugin_android/Plugins/Android/libs/${ABI}/
-    cp ${BUILD_PATH}/stripped/libyasio.so plugin_android/Plugins/Android/libs/${ABI}/libyasio.so
-    mkdir -p plugin_android/Plugins/Android/normal/${ABI}/
-    cp ${BUILD_PATH}/libyasio.so plugin_android/Plugins/Android/normal/${ABI}/libyasio.so
+    cp ${BUILD_PATH}/libyasio.so plugin_android/Plugins/Android/libs/${ABI}/libyasio.so
 }
 
 build android-16 armeabi-v7a arm-linux-androideabi-4.9

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,17 +1,18 @@
 {
   "dependencies": {
-    "com.unity.2d.animation": "3.2.3",
-    "com.unity.2d.pixel-perfect": "2.0.4",
-    "com.unity.2d.psdimporter": "2.1.4",
+    "com.unity.2d.animation": "7.1.0",
+    "com.unity.2d.pixel-perfect": "5.0.3",
+    "com.unity.2d.psdimporter": "6.0.9",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "3.0.12",
+    "com.unity.2d.spriteshape": "7.0.7",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.2.1",
-    "com.unity.test-framework": "1.1.14",
-    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.2.15",
+    "com.unity.collab-proxy": "2.2.0",
+    "com.unity.ide.rider": "3.0.27",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.6.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",