Update EDM4U & Demo Settings Min API 34

thirdweb-dev · Oct 28, 2024 · 9ddaac5 · 9ddaac5
1 parent c846921
commit 9ddaac5
Showing 28 changed files with 90 additions and 2,562 deletions.
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.IOSResolver.dll b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.IOSResolver.dll
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.IOSResolver.dll.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.IOSResolver.dll.meta
diff --git a/...irdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.PackageManagerResolver.dll b/...irdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.PackageManagerResolver.dll
diff --git a/...s/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.VersionHandlerImpl.dll b/...s/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.175/Google.VersionHandlerImpl.dll
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta
diff --git a/...ger/Editor/1.2.175/Google.JarResolver.dll → ...ger/Editor/1.2.183/Google.JarResolver.dll b/...ger/Editor/1.2.175/Google.JarResolver.dll → ...ger/Editor/1.2.183/Google.JarResolver.dll
diff --git a/...ditor/1.2.175/Google.JarResolver.dll.meta → ...ditor/1.2.183/Google.JarResolver.dll.meta b/...ditor/1.2.175/Google.JarResolver.dll.meta → ...ditor/1.2.183/Google.JarResolver.dll.meta
diff --git a/...irdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll b/...irdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll
diff --git a/...75/Google.PackageManagerResolver.dll.meta → ...83/Google.PackageManagerResolver.dll.meta b/...75/Google.PackageManagerResolver.dll.meta → ...83/Google.PackageManagerResolver.dll.meta
diff --git a/...s/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll b/...s/Thirdweb/Plugins/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll
diff --git a/....2.175/Google.VersionHandlerImpl.dll.meta → ....2.183/Google.VersionHandlerImpl.dll.meta b/....2.175/Google.VersionHandlerImpl.dll.meta → ....2.183/Google.VersionHandlerImpl.dll.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/CHANGELOG.md b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/CHANGELOG.md
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/CHANGELOG.md.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/Google.VersionHandler.dll
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/LICENSE b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/LICENSE
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/LICENSE.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/LICENSE.meta
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/README.md b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/README.md
diff --git a/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/README.md.meta b/Assets/Thirdweb/Plugins/ExternalDependencyManager/Editor/README.md.meta
diff --git a/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.175_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.175_manifest.txt
diff --git a/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt
@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb
+Assets/ExternalDependencyManager/Editor/CHANGELOG.md
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb
+Assets/ExternalDependencyManager/Editor/LICENSE
+Assets/ExternalDependencyManager/Editor/README.md
diff --git a/...manager_version-1.2.175_manifest.txt.meta → ...manager_version-1.2.183_manifest.txt.meta b/...manager_version-1.2.175_manifest.txt.meta → ...manager_version-1.2.183_manifest.txt.meta
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
@@ -28,6 +28,8 @@
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="False" />
     <setting name="projectExportEnabled" value="False" />
+    <setting name="useFullCustomMavenRepoPathWhenExport" value="True" />
+    <setting name="useFullCustomMavenRepoPathWhenNotExport" value="False" />
     <setting name="useJetifier" value="True" />
   </settings>
 </dependencies>
diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
@@ -16,5 +16,6 @@
   <projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="True" />
   <projectSetting name="GooglePlayServices.UseGradleDaemon" value="False" />
   <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
+  <projectSetting name="GooglePlayServices.UserRejectedGradleUpgrade" value="True" />
   <projectSetting name="GooglePlayServices.VerboseLogging" value="False" />
 </projectSettings>
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -173,7 +173,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 30
+  AndroidMinSdkVersion: 34
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: