Version 1.2.152

- Version 1.2.152 - Apr 17, 2020
* Version Handler: Fixed exception when waiting for enabled editor
  DLLs to load.
* Android Resolver: Fixed regression when using a Custom Gradle Template
  on Windows.

Change-Id: I57a7869a2257547eaa7039e00d84c238cc5e2c79

Author: Stewart Miles

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 1.2.152 - Apr 17, 2020
+* Version Handler: Fixed exception when waiting for enabled editor DLLs to
+  load.
+* Android Resolver: Fixed regression when using a Custom Gradle Template
+  on Windows.
+
 # Version 1.2.151 - Apr 16, 2020
 ## Bug Fixes
 * Version Handler: When waiting for newly enabled editor DLLs to load, ignore
@@ -14,12 +20,12 @@
 
 # Version 1.2.149 - Apr 8, 2020
 ## Bug Fixes
-* Unity Package Manager Resolver: Fixed spurious error message when resuming
+* Package Manager Resolver: Fixed spurious error message when resuming
   migration after installing a UPM package.
 
 # Version 1.2.148 - Apr 8, 2020
 ## Bug Fixes
-* Unity Package Manager Resolver: Fixed an exception when resuming migration
+* Package Manager Resolver: Fixed an exception when resuming migration
   after installing a UPM package.
 
 # Version 1.2.147 - Apr 8, 2020
@@ -34,7 +40,7 @@
 
 # Version 1.2.145 - Apr 2, 2020
 ## New Features
-* Unity Package Manager Resolver: Added a method to migrate Version Handler
+* Package Manager Resolver: Added a method to migrate Version Handler
   managed packages installed via `.unitypackage` to Unity Package Manager
   packages. This is initially used to migrate the External Dependency Manager
   to UPM.
@@ -74,7 +80,7 @@
 
 # Version 1.2.142 - Mar 19, 2020
 ## Changes
-* Unity Package Manager Resolver: Enabled auto-add by default.
+* Package Manager Resolver: Enabled auto-add by default.
 
 # Version 1.2.141 - Mar 19, 2020
 ## Bug Fixes
@@ -97,7 +103,7 @@
 
 # Version 1.2.138 - Mar 17, 2020
 ## New Features
-* Unity Package Manager Resolver: Added the Unity Package Manager Resolver
+* Package Manager Resolver: Added the Package Manager Resolver
   component that allows developers to easily boostrap Unity Package Manager
   (UPM) registry addition using unitypackage plugins.
 * Version Handler: Added a window that allows plugins to managed by the

build.gradle

@@ -226,7 +226,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.151"
+  pluginVersion = "1.2.152"
   // Directory that contains the template plugin.
   // Files under this directory are copied into the staging area for the
   // plugin.

exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Version 1.2.152 - Apr 17, 2020
+* Version Handler: Fixed exception when waiting for enabled editor DLLs to
+  load.
+* Android Resolver: Fixed regression when using a Custom Gradle Template
+  on Windows.
+
 # Version 1.2.151 - Apr 16, 2020
 ## Bug Fixes
 * Version Handler: When waiting for newly enabled editor DLLs to load, ignore
@@ -14,12 +20,12 @@
 
 # Version 1.2.149 - Apr 8, 2020
 ## Bug Fixes
-* Unity Package Manager Resolver: Fixed spurious error message when resuming
+* Package Manager Resolver: Fixed spurious error message when resuming
   migration after installing a UPM package.
 
 # Version 1.2.148 - Apr 8, 2020
 ## Bug Fixes
-* Unity Package Manager Resolver: Fixed an exception when resuming migration
+* Package Manager Resolver: Fixed an exception when resuming migration
   after installing a UPM package.
 
 # Version 1.2.147 - Apr 8, 2020
@@ -34,7 +40,7 @@
 
 # Version 1.2.145 - Apr 2, 2020
 ## New Features
-* Unity Package Manager Resolver: Added a method to migrate Version Handler
+* Package Manager Resolver: Added a method to migrate Version Handler
   managed packages installed via `.unitypackage` to Unity Package Manager
   packages. This is initially used to migrate the External Dependency Manager
   to UPM.
@@ -74,7 +80,7 @@
 
 # Version 1.2.142 - Mar 19, 2020
 ## Changes
-* Unity Package Manager Resolver: Enabled auto-add by default.
+* Package Manager Resolver: Enabled auto-add by default.
 
 # Version 1.2.141 - Mar 19, 2020
 ## Bug Fixes
@@ -97,7 +103,7 @@
 
 # Version 1.2.138 - Mar 17, 2020
 ## New Features
-* Unity Package Manager Resolver: Added the Unity Package Manager Resolver
+* Package Manager Resolver: Added the Package Manager Resolver
   component that allows developers to easily boostrap Unity Package Manager
   (UPM) registry addition using unitypackage plugins.
 * Version Handler: Added a window that allows plugins to managed by the

exploded/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta

@@ -11,7 +11,7 @@ Unity plugin that requires:
      [AARs](https://developer.android.com/studio/projects/android-library.html)).
    * iOS [CocoaPods](https://cocoapods.org/).
    * Version management of transitive dependencies.
-   * Management of Unity Package Manager Registries.
+   * Management of Unity Package Manager (UPM) Registries.
 
 Updated releases are available on
 [GitHub](https://github.com/googlesamples/unity-jar-resolver)
@@ -77,7 +77,7 @@ hosting and provides ways to discover, install, upgrade and uninstall packages.
 This makes it easier for developers to manage plugins within their projects.
 
 However, installing additional package registries requires a few manual steps
-that can potentially be error prone.  The *Unity Package Manager Resolver*
+that can potentially be error prone.  The *Package Manager Resolver*
 component of this plugin integrates with
 [UPM](https://docs.unity3d.com/Manual/Packages.html) to provide a way to
 auto-install UPM package registries when a `.unitypackage` is installed which
@@ -132,7 +132,7 @@ with Unity version 4.6.8 or higher.
 The *Version Handler* component only works with Unity 5.x or higher as it
 depends upon the `PluginImporter` UnityEditor API.
 
-The *Unity Package Manager Resolver* component only works with
+The *Package Manager Resolver* component only works with
 Unity 2018.4 or above, when
 [scoped registry](https://docs.unity3d.com/Manual/upm-scoped.html)
 support was added to the Unity Package Manager.
@@ -456,11 +456,11 @@ private static void PostProcessBuild_iOS(BuildTarget target, string buildPath)
 }
 ```
 
-# Unity Package Manager Resolver Usage
+# Package Manager Resolver Usage
 
 Adding registries to the
 [Unity Package Manager](https://docs.unity3d.com/Manual/Packages.html)
-(UPM) is a manual process. The Unity Package Manager Resolver (UPMR) component
+(UPM) is a manual process. The Package Manager Resolver (PMR) component
 of this plugin makes it easy for plugin maintainers to distribute new UPM
 registry servers and easy for plugin users to manage UPM registry servers.
 
@@ -497,30 +497,30 @@ For example, to add a registry for plugins in the scope `com.coolstuff`:
 </registries>
 ```
 
-When UPMR is loaded it will prompt the developer to add the registry to their
+When PMR is loaded it will prompt the developer to add the registry to their
 project if it isn't already present in the `Packages/manifest.json` file.
 
 For more information, see Unity's documentation on
 [scoped package registries](https://docs.unity3d.com/Manual/upm-scoped.html).
 
 ## Managing Registries
 
-It's possible to add and remove registries that are specified via UPMR
+It's possible to add and remove registries that are specified via PMR
 XML configuration files via the following menu options:
 
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Add Registries` will prompt the user with a window which allows them to
   add registries discovered in the project to the Unity Package Manager.
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Remove Registries` will prompt the user with a window which allows them to
   remove registries discovered in the project from the Unity Package Manager.
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Modify Registries` will prompt the user with a window which allows them to
   add or remove registries discovered in the project.
 
 ## Migration
 
-UPMR can migrate Version Handler packages installed in the `Assets` folder
+PMR can migrate Version Handler packages installed in the `Assets` folder
 to UPM packages. This requires the plugins to implement the following:
 
 * `.unitypackage` must include a Version Handler manifests that describes
@@ -535,7 +535,7 @@ to UPM packages. This requires the plugins to implement the following:
   in the *Version Handler Usage* section.
 
 When using the `Assets > External Dependency Manager >
-Unity Package Manager Resolver > Migrate Packages` menu option, UPMR then
+Package Manager Resolver > Migrate Packages` menu option, PMR then
 will:
 
 * List all Version Handler manager packages in the project.
@@ -549,8 +549,8 @@ will:
 
 ## Configuration
 
-UPMR can be configured via the `Assets > External Dependency Manager >
-Unity Package Manager Resolver > Settings` menu option:
+PMR can be configured via the `Assets > External Dependency Manager >
+Package Manager Resolver > Settings` menu option:
 
 * `Add package registries` when enabled, when the plugin loads or registry
   configuration files change, this will prompt the user to add registries

exploded/Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.151.dll.mdb

@@ -1,14 +1,14 @@
 Assets/ExternalDependencyManager/Editor/CHANGELOG.md
-Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.151.dll
-Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.151.dll.mdb
-Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.151.dll
-Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.151.dll.mdb
-Assets/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver_v1.2.151.dll
-Assets/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver_v1.2.151.dll.mdb
+Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.152.dll
+Assets/ExternalDependencyManager/Editor/Google.IOSResolver_v1.2.152.dll.mdb
+Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.152.dll
+Assets/ExternalDependencyManager/Editor/Google.JarResolver_v1.2.152.dll.mdb
+Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.152.dll
+Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver_v1.2.152.dll.mdb
 Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
 Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
-Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.151.dll
-Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.151.dll.mdb
+Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.152.dll
+Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.152.dll.mdb
 Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml
 Assets/ExternalDependencyManager/Editor/LICENSE
 Assets/ExternalDependencyManager/Editor/README.md