diff --git a/CHANGELOG.md b/CHANGELOG.md index 7238a5dc..80f13fa1 100644 --- 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 index 321e9534..538990ac 100644 --- 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/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll index e7568472..d013e467 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta index a1f98e95..0a8679d1 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a366c71c93ae411ea1ece423e8b1538f +guid: 59af55ec98c34b8d92e48d7184a21ec5 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb old mode 100755 new mode 100644 similarity index 97% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb index d410ff55..585c9f2e Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta similarity index 57% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta index fa1861f7..60a02247 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 586d58d05379419a8006364797db5fc8 +guid: e0dd26d694634a11a15aa1a8e9066545 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll similarity index 91% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll index 736956c7..ca463bb8 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta index 76e3276b..70cfe7ae 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9cab53159f0a43b68c16552c892bd579 +guid: df91cbc3889f448ab56989da8283a95d labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb old mode 100755 new mode 100644 similarity index 91% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb index 281accfb..a8670d1b Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta similarity index 57% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta index c4968e93..8a553cec 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3e0353d541d44c98a54fc99fd1f63d18 +guid: e3777e7740314f9aa06e94be0c7e8268 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll index 7aec9fc4..30d30658 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta index d2688be1..eb79a088 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 06f4aa8c065049e5970eedec5f52600f +guid: 37e6baea45a44a6988cf105fd1bfb9f4 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb index cb06c262..5a2b4b42 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta similarity index 58% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta index 08e08b5b..198672a1 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 057fc189f58c4beea22228ccf76de84a +guid: 544f4bc649714c569504690d8157de4b labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll old mode 100755 new mode 100644 similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll index ec5f0114..74d8d53f Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta similarity index 82% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta index 19e6ef21..8564543a 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ad4fd0d2f20345839aa31291c8c0c285 +guid: e31c9800508f44c1afe7d26ac66250b2 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb old mode 100755 new mode 100644 similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb index 1c7f97cd..150fc7ea Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta similarity index 58% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta rename to exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta index 42a37db5..cfd3238b 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: eb5385e23ba94b15bd4c185022985fc5 +guid: d50b2177ae7c4abf8ad799c0b3e13672 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index 923ed3c6..80f13fa1 100644 --- 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 index 449effa7..2aa655df 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2b4957d4e158489ca7b410312d84e001 +guid: af66966cf1cf49089946f210b64185b7 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index d313c623..430c3483 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 355226f6..c3968935 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 164f2f671ce9410dadebde5826bc0b51 +guid: c7751ebdcb3d4f0b9cbc0741eb1e683f labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvh - gvhp_targets-editor diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb index 217ac51e..7dd02af5 100644 Binary files a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb and b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb differ diff --git a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 07996d2f..fa11eee6 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d288fc5d6f024b9981c15982d8fd85ab +guid: 16ad47774cbe4f31a43e79fa12bde626 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb - gvh timeCreated: 1538009133 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 09318f69..4b59ae0d 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 805e2c2846dd44248246ef896b03c176 +guid: 6926d2080b8848628f6755943ad6eecd labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/README.md b/exploded/Assets/ExternalDependencyManager/Editor/README.md index 3a7a5a26..a9aafe9f 100644 --- 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 index b035ebdf..f1cce97f 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 48c105d983344236ba7fd1e7d7208fca +guid: 1a8431cde2d446ff9ad317b5a26dbf06 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md - gvh timeCreated: 1584567712 diff --git a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt deleted file mode 100644 index d2b057ed..00000000 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -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/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt new file mode 100644 index 00000000..9a0772c7 --- /dev/null +++ b/exploded/Assets/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/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta similarity index 75% rename from exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta rename to exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta index 99cc7ad7..cee150c6 100644 --- a/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta +++ b/exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 98518d47e8b1473f8055106d5eb931c7 +guid: b9f8b541191d4eb79499c0b8258dd645 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt - gvh - gvh_manifest - gvhp_manifestname-0External Dependency Manager diff --git a/export_unity_package_guids.json b/export_unity_package_guids.json index 41a50553..eb0105a9 100644 --- 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 deleted file mode 100644 index d7a5a739..00000000 Binary files a/external-dependency-manager-1.2.183.unitypackage and /dev/null differ diff --git a/external-dependency-manager-1.2.184.unitypackage b/external-dependency-manager-1.2.184.unitypackage new file mode 100644 index 00000000..1f9e82f2 Binary files /dev/null and b/external-dependency-manager-1.2.184.unitypackage differ diff --git a/external-dependency-manager-latest.unitypackage b/external-dependency-manager-latest.unitypackage index d7a5a739..1f9e82f2 100644 Binary files a/external-dependency-manager-latest.unitypackage and b/external-dependency-manager-latest.unitypackage differ diff --git a/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 449effa7..2aa655df 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2b4957d4e158489ca7b410312d84e001 +guid: af66966cf1cf49089946f210b64185b7 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md - gvh timeCreated: 1584567712 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta index a1f98e95..0a8679d1 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a366c71c93ae411ea1ece423e8b1538f +guid: 59af55ec98c34b8d92e48d7184a21ec5 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta index fa1861f7..60a02247 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.IOSResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 586d58d05379419a8006364797db5fc8 +guid: e0dd26d694634a11a15aa1a8e9066545 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta index 76e3276b..70cfe7ae 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9cab53159f0a43b68c16552c892bd579 +guid: df91cbc3889f448ab56989da8283a95d labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta index c4968e93..8a553cec 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.JarResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3e0353d541d44c98a54fc99fd1f63d18 +guid: e3777e7740314f9aa06e94be0c7e8268 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta index d2688be1..eb79a088 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 06f4aa8c065049e5970eedec5f52600f +guid: 37e6baea45a44a6988cf105fd1bfb9f4 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta index 08e08b5b..198672a1 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 057fc189f58c4beea22228ccf76de84a +guid: 544f4bc649714c569504690d8157de4b labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 355226f6..c3968935 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 164f2f671ce9410dadebde5826bc0b51 +guid: c7751ebdcb3d4f0b9cbc0741eb1e683f labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvh - gvhp_targets-editor diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 07996d2f..fa11eee6 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d288fc5d6f024b9981c15982d8fd85ab +guid: 16ad47774cbe4f31a43e79fa12bde626 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb - gvh timeCreated: 1538009133 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta index 19e6ef21..8564543a 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ad4fd0d2f20345839aa31291c8c0c285 +guid: e31c9800508f44c1afe7d26ac66250b2 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll - gvh - gvhp_targets-editor PluginImporter: diff --git a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta index 42a37db5..cfd3238b 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: eb5385e23ba94b15bd4c185022985fc5 +guid: d50b2177ae7c4abf8ad799c0b3e13672 labels: -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb - gvh timeCreated: 1538009133 licenseType: Pro diff --git a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 09318f69..4b59ae0d 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 805e2c2846dd44248246ef896b03c176 +guid: 6926d2080b8848628f6755943ad6eecd labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE - gvh timeCreated: 1584567712 diff --git a/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta b/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta index b035ebdf..f1cce97f 100644 --- a/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/plugin/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 48c105d983344236ba7fd1e7d7208fca +guid: 1a8431cde2d446ff9ad317b5a26dbf06 labels: -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md - gvh timeCreated: 1584567712 diff --git a/source/AndroidResolver/scripts/gradle-template.zip b/source/AndroidResolver/scripts/gradle-template.zip index 82b81cd0..db181f66 100644 Binary files a/source/AndroidResolver/scripts/gradle-template.zip and b/source/AndroidResolver/scripts/gradle-template.zip differ diff --git a/source/AndroidResolver/src/VersionNumber.cs b/source/AndroidResolver/src/VersionNumber.cs index 8a9ccc4b..9355eecf 100644 --- a/source/AndroidResolver/src/VersionNumber.cs +++ b/source/AndroidResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class AndroidResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.183"; + private const string VERSION_STRING = "1.2.184"; /// /// Cached version structure. diff --git a/source/IOSResolver/src/VersionNumber.cs b/source/IOSResolver/src/VersionNumber.cs index 8cc2f44c..d441f9fd 100644 --- a/source/IOSResolver/src/VersionNumber.cs +++ b/source/IOSResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class IOSResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.183"; + private const string VERSION_STRING = "1.2.184"; /// /// Cached version structure. diff --git a/source/PackageManagerResolver/src/VersionNumber.cs b/source/PackageManagerResolver/src/VersionNumber.cs index 823118fd..529d5074 100644 --- a/source/PackageManagerResolver/src/VersionNumber.cs +++ b/source/PackageManagerResolver/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class PackageManagerResolverVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.183"; + private const string VERSION_STRING = "1.2.184"; /// /// Cached version structure. diff --git a/source/VersionHandlerImpl/src/VersionNumber.cs b/source/VersionHandlerImpl/src/VersionNumber.cs index b2f6a9be..f1f5f8cb 100644 --- a/source/VersionHandlerImpl/src/VersionNumber.cs +++ b/source/VersionHandlerImpl/src/VersionNumber.cs @@ -27,7 +27,7 @@ public class VersionHandlerVersionNumber { /// /// Version number, patched by the build process. /// - private const string VERSION_STRING = "1.2.183"; + private const string VERSION_STRING = "1.2.184"; /// /// Cached version structure. diff --git a/upm/CHANGELOG.md b/upm/CHANGELOG.md index 923ed3c6..80f13fa1 100755 --- a/upm/CHANGELOG.md +++ b/upm/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/upm/CHANGELOG.md.meta b/upm/CHANGELOG.md.meta index 62409374..2c34fbda 100644 --- a/upm/CHANGELOG.md.meta +++ b/upm/CHANGELOG.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: dd6a29a412594aadb37d9698db325eca labels: - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-CHANGELOG.md timeCreated: 0 diff --git a/upm/Documentation~/index.md b/upm/Documentation~/index.md index 3a7a5a26..a9aafe9f 100755 --- a/upm/Documentation~/index.md +++ b/upm/Documentation~/index.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/upm/ExternalDependencyManager/Editor/1.2.183.meta b/upm/ExternalDependencyManager/Editor/1.2.184.meta similarity index 77% rename from upm/ExternalDependencyManager/Editor/1.2.183.meta rename to upm/ExternalDependencyManager/Editor/1.2.184.meta index e8306b84..1134f43f 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5c127f68af44472d8099a80364a25718 +guid: 297013161bc34ce4ac7b8ffba2384862 timeCreated: 1480838400 folderAsset: true DefaultImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll index e7568472..d013e467 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta similarity index 82% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta index 7a96f2d6..ac73472a 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a366c71c93ae411ea1ece423e8b1538f +guid: 59af55ec98c34b8d92e48d7184a21ec5 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb old mode 100644 new mode 100755 similarity index 97% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb index d410ff55..585c9f2e Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta index 32e9ca3a..014ca251 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 586d58d05379419a8006364797db5fc8 +guid: e0dd26d694634a11a15aa1a8e9066545 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.IOSResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.IOSResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll similarity index 91% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll index 736956c7..ca463bb8 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta similarity index 82% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta index 9faa5fa8..19bb0e7f 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 9cab53159f0a43b68c16552c892bd579 +guid: df91cbc3889f448ab56989da8283a95d labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb old mode 100644 new mode 100755 similarity index 91% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb index 281accfb..a8670d1b Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta index f26d0818..3489b406 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 3e0353d541d44c98a54fc99fd1f63d18 +guid: e3777e7740314f9aa06e94be0c7e8268 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.JarResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.JarResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll index 7aec9fc4..30d30658 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta similarity index 83% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta index e8072f33..2efa6a69 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 06f4aa8c065049e5970eedec5f52600f +guid: 37e6baea45a44a6988cf105fd1bfb9f4 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb similarity index 98% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb index cb06c262..5a2b4b42 100755 Binary files a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta index 6d25cd96..790022eb 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 057fc189f58c4beea22228ccf76de84a +guid: 544f4bc649714c569504690d8157de4b labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.PackageManagerResolver.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.PackageManagerResolver.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll old mode 100644 new mode 100755 similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll index ec5f0114..74d8d53f Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta similarity index 83% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta index 84a1922d..357244fb 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: ad4fd0d2f20345839aa31291c8c0c285 +guid: e31c9800508f44c1afe7d26ac66250b2 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.dll +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.dll - gvhp_targets-editor timeCreated: 1480838400 PluginImporter: diff --git a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb old mode 100644 new mode 100755 similarity index 98% rename from exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb index 1c7f97cd..150fc7ea Binary files a/exploded/Assets/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb and b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta similarity index 69% rename from upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta rename to upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta index f4940472..ebb0325f 100644 --- a/upm/ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: eb5385e23ba94b15bd4c185022985fc5 +guid: d50b2177ae7c4abf8ad799c0b3e13672 labels: - gvh -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.183/Google.VersionHandlerImpl.pdb +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.184/Google.VersionHandlerImpl.pdb - gvhp_targets-editor timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll index d313c623..430c3483 100755 Binary files a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index fa372ec6..1af795ea 100644 --- a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 164f2f671ce9410dadebde5826bc0b51 +guid: c7751ebdcb3d4f0b9cbc0741eb1e683f labels: - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor timeCreated: 1480838400 diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb index 217ac51e..7dd02af5 100755 Binary files a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb and b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb differ diff --git a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta index 21433bd0..28ad1d5a 100644 --- a/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta +++ b/upm/ExternalDependencyManager/Editor/Google.VersionHandler.pdb.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d288fc5d6f024b9981c15982d8fd85ab +guid: 16ad47774cbe4f31a43e79fa12bde626 labels: - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb timeCreated: 1538009133 licenseType: Pro diff --git a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt deleted file mode 100755 index d2b057ed..00000000 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -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/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt new file mode 100755 index 00000000..9a0772c7 --- /dev/null +++ b/upm/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/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta similarity index 75% rename from upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta rename to upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta index 1e9bece8..571439c2 100644 --- a/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt.meta +++ b/upm/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 98518d47e8b1473f8055106d5eb931c7 +guid: b9f8b541191d4eb79499c0b8258dd645 labels: - gvh - gvh_manifest -- gvh_version-1.2.183 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.183_manifest.txt +- gvh_version-1.2.184 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.184_manifest.txt - gvhp_manifestname-0External Dependency Manager - gvhp_manifestname-play-services-resolver timeCreated: 1474401009 diff --git a/upm/LICENSE.md.meta b/upm/LICENSE.md.meta index 0f8f5bfb..57ccdcf4 100644 --- a/upm/LICENSE.md.meta +++ b/upm/LICENSE.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: f61a1c8e753b496bb696e77d7eedfb95 labels: - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-LICENSE.md timeCreated: 0 diff --git a/upm/README.md b/upm/README.md index 3a7a5a26..a9aafe9f 100755 --- a/upm/README.md +++ b/upm/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/upm/README.md.meta b/upm/README.md.meta index 1a22e05e..fa5d29ad 100644 --- a/upm/README.md.meta +++ b/upm/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: cbbebcaa6ecb4b9582dce440a386de75 labels: - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-README.md timeCreated: 0 diff --git a/upm/package.json b/upm/package.json index 0ce5ef18..344ef081 100755 --- a/upm/package.json +++ b/upm/package.json @@ -1,6 +1,6 @@ { "name": "com.google.external-dependency-manager", - "version": "1.2.183", + "version": "1.2.184", "displayName": "External Dependency Manager for Unity", "keywords": [ "Google", diff --git a/upm/package.json.meta b/upm/package.json.meta index 03113d4d..f4e5b61f 100644 --- a/upm/package.json.meta +++ b/upm/package.json.meta @@ -3,6 +3,6 @@ guid: 9bed450d5c03481d87e61b61431cf00a labels: - gupmr_manifest - gvh -- gvh_version-1.2.183 +- gvh_version-1.2.184 - gvhp_exportpath-package.json timeCreated: 0