Updates for version 1.1.1

Bug fix for space in path. Merge pull request #2 from RodGreen/patch-1 Fixes unity script compile error 'TypeLoadException' Change-Id: I143971b86ca175d6c48c4aa82be86ad8a2086950
googlesamples · Feb 27, 2016 · 63eb8ea · 63eb8ea
2 parents 0efa136 + e98d780
commit 63eb8ea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.1.1 - 25 Feb 2016
+## Bug Fixes 
+    * #1 Spaces in project path not handled when exploding Aar file.
+    * #2 Script compilation error: TypeLoadException.
 # Version 1.1.0 - 5 Feb 2016
 ## New Features
   * Adds friendly alert when JAVA_HOME is not set on Windows platforms.

diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ project.ext {
     buildPath = file('build').absolutePath
     exportPath = file('build/plugin.unitypackage').absolutePath
     currentPluginPath = file('.').absolutePath
-    currentPluginName = 'play-services-resolver-1.1.0.unitypackage'
+    currentPluginName = 'play-services-resolver-1.1.1.unitypackage'
 }
 
 if (!tasks.findByName('prebuild')) {

diff --git a/play-services-resolver-1.1.0.unitypackage b/play-services-resolver-1.1.0.unitypackage
diff --git a/plugin/Assets/PlayServicesResolver/Editor/DefaultResolver.cs b/plugin/Assets/PlayServicesResolver/Editor/DefaultResolver.cs
@@ -203,7 +203,8 @@ internal virtual string ProcessAar(string dir, string aarFile)
 
                 System.Diagnostics.Process p = new System.Diagnostics.Process();
                 p.StartInfo.UseShellExecute = false;
-                p.StartInfo.Arguments = "xvf " + Path.GetFullPath(aarFile);
+                p.StartInfo.Arguments = "xvf " +
+                    "\"" + Path.GetFullPath(aarFile) + "\"";
                 p.StartInfo.CreateNoWindow = true;
                 p.StartInfo.RedirectStandardOutput = false;
                 p.StartInfo.RedirectStandardError = true;

diff --git a/plugin/Assets/PlayServicesResolver/Editor/PlayServicesResolver.cs b/plugin/Assets/PlayServicesResolver/Editor/PlayServicesResolver.cs
@@ -93,9 +93,7 @@ static IResolver Resolver
                 if (_resolver == null)
                 {
                     // create the latest resolver known.
-                    Type type = Type.GetType(CurrentResolverName, true);
-
-                    _resolver = Activator.CreateInstance(type) as IResolver;
+                    _resolver = Activator.CreateInstance("GooglePlayServices", CurrentResolverName) as IResolver;
                 }
                 return _resolver;
             }