Version 1.2.184 (#728)

googlesamples · Jan 28, 2025 · ced86f2 · ced86f2
1 parent 5351241
commit ced86f2
Show file tree

Hide file tree

Showing 84 changed files with 174 additions and 141 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
-# Upcoming
-* Android Resolver - Update and resolve `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715
+# Version 1.2.184 - Jan 28, 2025
+* Android Resolver - Update and resolve `packaging` keyword in maintemplate
+  based on android gradle plugin version.
+  Fixes #715
 
 # Version 1.2.183 - Sep 18, 2024
 * Android Resolver - Handle package paths that don't include a version hash,

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.183"
+  pluginVersion = "1.2.184"
   // 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.183/Google.IOSResolver.dll → ...ger/Editor/1.2.184/Google.IOSResolver.dll b/...ger/Editor/1.2.183/Google.IOSResolver.dll → ...ger/Editor/1.2.184/Google.IOSResolver.dll
diff --git a/...ditor/1.2.183/Google.IOSResolver.dll.meta → ...ditor/1.2.184/Google.IOSResolver.dll.meta b/...ditor/1.2.183/Google.IOSResolver.dll.meta → ...ditor/1.2.184/Google.IOSResolver.dll.meta
diff --git a/...ger/Editor/1.2.183/Google.IOSResolver.pdb → ...ger/Editor/1.2.184/Google.IOSResolver.pdb b/...ger/Editor/1.2.183/Google.IOSResolver.pdb → ...ger/Editor/1.2.184/Google.IOSResolver.pdb
diff --git a/...ditor/1.2.183/Google.IOSResolver.pdb.meta → ...ditor/1.2.184/Google.IOSResolver.pdb.meta b/...ditor/1.2.183/Google.IOSResolver.pdb.meta → ...ditor/1.2.184/Google.IOSResolver.pdb.meta
diff --git a/...ger/Editor/1.2.183/Google.JarResolver.dll → ...ger/Editor/1.2.184/Google.JarResolver.dll b/...ger/Editor/1.2.183/Google.JarResolver.dll → ...ger/Editor/1.2.184/Google.JarResolver.dll
diff --git a/...ditor/1.2.183/Google.JarResolver.dll.meta → ...ditor/1.2.184/Google.JarResolver.dll.meta b/...ditor/1.2.183/Google.JarResolver.dll.meta → ...ditor/1.2.184/Google.JarResolver.dll.meta
diff --git a/...ger/Editor/1.2.183/Google.JarResolver.pdb → ...ger/Editor/1.2.184/Google.JarResolver.pdb b/...ger/Editor/1.2.183/Google.JarResolver.pdb → ...ger/Editor/1.2.184/Google.JarResolver.pdb
diff --git a/...ditor/1.2.183/Google.JarResolver.pdb.meta → ...ditor/1.2.184/Google.JarResolver.pdb.meta b/...ditor/1.2.183/Google.JarResolver.pdb.meta → ...ditor/1.2.184/Google.JarResolver.pdb.meta
diff --git a/...1.2.183/Google.PackageManagerResolver.dll → ...1.2.184/Google.PackageManagerResolver.dll b/...1.2.183/Google.PackageManagerResolver.dll → ...1.2.184/Google.PackageManagerResolver.dll
diff --git a/...83/Google.PackageManagerResolver.dll.meta → ...84/Google.PackageManagerResolver.dll.meta b/...83/Google.PackageManagerResolver.dll.meta → ...84/Google.PackageManagerResolver.dll.meta
diff --git a/...1.2.183/Google.PackageManagerResolver.pdb → ...1.2.184/Google.PackageManagerResolver.pdb b/...1.2.183/Google.PackageManagerResolver.pdb → ...1.2.184/Google.PackageManagerResolver.pdb
diff --git a/...83/Google.PackageManagerResolver.pdb.meta → ...84/Google.PackageManagerResolver.pdb.meta b/...83/Google.PackageManagerResolver.pdb.meta → ...84/Google.PackageManagerResolver.pdb.meta
diff --git a/...tor/1.2.183/Google.VersionHandlerImpl.dll → ...tor/1.2.184/Google.VersionHandlerImpl.dll b/...tor/1.2.183/Google.VersionHandlerImpl.dll → ...tor/1.2.184/Google.VersionHandlerImpl.dll
diff --git a/....2.183/Google.VersionHandlerImpl.dll.meta → ....2.184/Google.VersionHandlerImpl.dll.meta b/....2.183/Google.VersionHandlerImpl.dll.meta → ....2.184/Google.VersionHandlerImpl.dll.meta
diff --git a/...tor/1.2.183/Google.VersionHandlerImpl.pdb → ...tor/1.2.184/Google.VersionHandlerImpl.pdb b/...tor/1.2.183/Google.VersionHandlerImpl.pdb → ...tor/1.2.184/Google.VersionHandlerImpl.pdb
diff --git a/....2.183/Google.VersionHandlerImpl.pdb.meta → ....2.184/Google.VersionHandlerImpl.pdb.meta b/....2.183/Google.VersionHandlerImpl.pdb.meta → ....2.184/Google.VersionHandlerImpl.pdb.meta
diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 1.2.184 - Jan 28, 2025
+* Android Resolver - Update and resolve `packaging` keyword in maintemplate
+  based on android gradle plugin version.
+  Fixes #715
+
 # Version 1.2.183 - Sep 18, 2024
 * Android Resolver - Handle package paths that don't include a version hash,
   which is no longer present with Unity 6. Fixes #697

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 b/exploded/Assets/ExternalDependencyManager/Editor/README.md
@@ -72,6 +72,12 @@ EDM4U is available on
 openupm add com.google.external-dependency-manager
 ```
 
+### Install via git URL
+1. Open Package Manager
+2. Click on the + icon on the top left corner of the "Package Manager" screen
+3. Click on "Install package from git url..."
+4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm
+
 ### Install via Google APIs for Unity
 
 EDM4U is available both in UPM and legacy `.unitypackage` formats on

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.183_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt
diff --git a/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt b/...ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt
@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.184/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.183_manifest.txt.meta → ...manager_version-1.2.184_manifest.txt.meta b/...manager_version-1.2.183_manifest.txt.meta → ...manager_version-1.2.184_manifest.txt.meta
diff --git a/export_unity_package_guids.json b/export_unity_package_guids.json
@@ -60,5 +60,8 @@
     },
     "1.2.183": {
         "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.183": "5c127f68af44472d8099a80364a25718"
+    },
+    "1.2.184": {
+        "com.google.external-dependency-manager/ExternalDependencyManager/Editor/1.2.184": "297013161bc34ce4ac7b8ffba2384862"
     }
 }
diff --git a/external-dependency-manager-1.2.183.unitypackage b/external-dependency-manager-1.2.183.unitypackage
diff --git a/external-dependency-manager-1.2.184.unitypackage b/external-dependency-manager-1.2.184.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/scripts/gradle-template.zip b/source/AndroidResolver/scripts/gradle-template.zip
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.183";
+        private const string VERSION_STRING = "1.2.184";
 
         /// <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.183";
+        private const string VERSION_STRING = "1.2.184";
 
         /// <summary>
         /// Cached version structure.