Version 1.2.182 (#702)

# Version 1.2.182 - Aug 2, 2024 * General - Check for gradle version instead of Unity version when determining the template files to modify.
googlesamples · Aug 2, 2024 · 12cca2d · 12cca2d
1 parent 8e4659a
commit 12cca2d
Show file tree

Hide file tree

Showing 81 changed files with 158 additions and 140 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.2.182 - Aug 2, 2024
+* General - Check for gradle version instead of Unity version when determining
+  the template files to modify.
+
 # Version 1.2.181 - Jun 26, 2024
 * General - Disable `EditorMeasurement` reporting that relied on the
   Measurement Protocol for Universal Analytics.

diff --git a/build.gradle b/build.gradle
@@ -255,7 +255,7 @@ project.ext {
   // Directory for testing.
   testDir = new File(scriptDirectory, "test_output")
   // Version of the plugin (update this with CHANGELOG.md on each release).
-  pluginVersion = "1.2.181"
+  pluginVersion = "1.2.182"
   // Directory that contains the template plugin.
   // Files under this directory are copied into the staging area for the
   // plugin.

diff --git a/...ger/Editor/1.2.181/Google.IOSResolver.dll → ...ger/Editor/1.2.182/Google.IOSResolver.dll b/...ger/Editor/1.2.181/Google.IOSResolver.dll → ...ger/Editor/1.2.182/Google.IOSResolver.dll
diff --git a/...ditor/1.2.181/Google.IOSResolver.dll.meta → ...ditor/1.2.182/Google.IOSResolver.dll.meta b/...ditor/1.2.181/Google.IOSResolver.dll.meta → ...ditor/1.2.182/Google.IOSResolver.dll.meta
diff --git a/...ger/Editor/1.2.181/Google.IOSResolver.pdb → ...ger/Editor/1.2.182/Google.IOSResolver.pdb b/...ger/Editor/1.2.181/Google.IOSResolver.pdb → ...ger/Editor/1.2.182/Google.IOSResolver.pdb
diff --git a/...ditor/1.2.181/Google.IOSResolver.pdb.meta → ...ditor/1.2.182/Google.IOSResolver.pdb.meta b/...ditor/1.2.181/Google.IOSResolver.pdb.meta → ...ditor/1.2.182/Google.IOSResolver.pdb.meta
diff --git a/...ger/Editor/1.2.181/Google.JarResolver.dll → ...ger/Editor/1.2.182/Google.JarResolver.dll b/...ger/Editor/1.2.181/Google.JarResolver.dll → ...ger/Editor/1.2.182/Google.JarResolver.dll
diff --git a/...ditor/1.2.181/Google.JarResolver.dll.meta → ...ditor/1.2.182/Google.JarResolver.dll.meta b/...ditor/1.2.181/Google.JarResolver.dll.meta → ...ditor/1.2.182/Google.JarResolver.dll.meta
diff --git a/...ger/Editor/1.2.181/Google.JarResolver.pdb → ...ger/Editor/1.2.182/Google.JarResolver.pdb b/...ger/Editor/1.2.181/Google.JarResolver.pdb → ...ger/Editor/1.2.182/Google.JarResolver.pdb
diff --git a/...ditor/1.2.181/Google.JarResolver.pdb.meta → ...ditor/1.2.182/Google.JarResolver.pdb.meta b/...ditor/1.2.181/Google.JarResolver.pdb.meta → ...ditor/1.2.182/Google.JarResolver.pdb.meta
diff --git a/...1.2.181/Google.PackageManagerResolver.dll → ...1.2.182/Google.PackageManagerResolver.dll b/...1.2.181/Google.PackageManagerResolver.dll → ...1.2.182/Google.PackageManagerResolver.dll
diff --git a/...81/Google.PackageManagerResolver.dll.meta → ...82/Google.PackageManagerResolver.dll.meta b/...81/Google.PackageManagerResolver.dll.meta → ...82/Google.PackageManagerResolver.dll.meta
diff --git a/...1.2.181/Google.PackageManagerResolver.pdb → ...1.2.182/Google.PackageManagerResolver.pdb b/...1.2.181/Google.PackageManagerResolver.pdb → ...1.2.182/Google.PackageManagerResolver.pdb
diff --git a/...81/Google.PackageManagerResolver.pdb.meta → ...82/Google.PackageManagerResolver.pdb.meta b/...81/Google.PackageManagerResolver.pdb.meta → ...82/Google.PackageManagerResolver.pdb.meta
diff --git a/...tor/1.2.181/Google.VersionHandlerImpl.dll → ...tor/1.2.182/Google.VersionHandlerImpl.dll b/...tor/1.2.181/Google.VersionHandlerImpl.dll → ...tor/1.2.182/Google.VersionHandlerImpl.dll
diff --git a/....2.181/Google.VersionHandlerImpl.dll.meta → ....2.182/Google.VersionHandlerImpl.dll.meta b/....2.181/Google.VersionHandlerImpl.dll.meta → ....2.182/Google.VersionHandlerImpl.dll.meta
diff --git a/...tor/1.2.181/Google.VersionHandlerImpl.pdb → ...tor/1.2.182/Google.VersionHandlerImpl.pdb b/...tor/1.2.181/Google.VersionHandlerImpl.pdb → ...tor/1.2.182/Google.VersionHandlerImpl.pdb
diff --git a/....2.181/Google.VersionHandlerImpl.pdb.meta → ....2.182/Google.VersionHandlerImpl.pdb.meta b/....2.181/Google.VersionHandlerImpl.pdb.meta → ....2.182/Google.VersionHandlerImpl.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.2.182 - Aug 2, 2024
+* General - Check for gradle version instead of Unity version when determining
+  the template files to modify.
+
 # Version 1.2.181 - Jun 26, 2024
 * General - Disable `EditorMeasurement` reporting that relied on the
   Measurement Protocol for Universal Analytics.

diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta b/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta
diff --git a/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.181_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.181_manifest.txt
diff --git a/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt
@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.182/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.181_manifest.txt.meta → ...manager_version-1.2.182_manifest.txt.meta b/...manager_version-1.2.181_manifest.txt.meta → ...manager_version-1.2.182_manifest.txt.meta
diff --git a/export_unity_package_guids.json b/export_unity_package_guids.json
@@ -54,5 +54,8 @@
     },
     "1.2.181": {
         "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.181": "d27fe564f10147d1bfded8244b25b494"
+    },
+    "1.2.182": {
+        "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.182": "60e9ce1be3474de5bdded37d1462e09b"
     }
 }
diff --git a/external-dependency-manager-1.2.181.unitypackage b/external-dependency-manager-1.2.181.unitypackage
diff --git a/external-dependency-manager-1.2.182.unitypackage b/external-dependency-manager-1.2.182.unitypackage
diff --git a/external-dependency-manager-latest.unitypackage b/external-dependency-manager-latest.unitypackage
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta
diff --git a/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta
diff --git a/source/AndroidResolver/src/GradleTemplateResolver.cs b/source/AndroidResolver/src/GradleTemplateResolver.cs
@@ -163,7 +163,10 @@ public static string UnityGradleSettingsTemplatePath {
         /// </summary>
         public static bool UnityChangeMavenRepoInSettingsTemplate {
             get {
-                return Google.VersionHandler.GetUnityVersionMajorMinor() >= 2022.2f;
+                // Check against the Android Gradle plugin version being used, since that can
+                // change between Unity minor versions.
+                return (new Dependency.VersionComparer()).Compare(
+                    "7.0", PlayServicesResolver.AndroidGradlePluginVersion) >= 0;
             }
         }
 

diff --git a/source/AndroidResolver/src/VersionNumber.cs b/source/AndroidResolver/src/VersionNumber.cs
@@ -27,7 +27,7 @@ public class AndroidResolverVersionNumber {
         /// <summary>
         /// Version number, patched by the build process.
         /// </summary>
-        private const string VERSION_STRING = "1.2.181";
+        private const string VERSION_STRING = "1.2.182";
 
         /// <summary>
         /// Cached version structure.

diff --git a/source/IOSResolver/src/VersionNumber.cs b/source/IOSResolver/src/VersionNumber.cs
@@ -27,7 +27,7 @@ public class IOSResolverVersionNumber {
         /// <summary>
         /// Version number, patched by the build process.
         /// </summary>
-        private const string VERSION_STRING = "1.2.181";
+        private const string VERSION_STRING = "1.2.182";
 
         /// <summary>
         /// Cached version structure.