Fixed resolution when the Assets/Plugins/Android is named incorrectly.

Fixed Android resolution when the `Assets/Plugins/Android` is named
incorrectly.  For example, `Assets/plugins/Android` is recognized by
Unity as C# filesystem methods like Directory.Exists() are case
insensitive.  However, the Android Resolver uses Gradle to perform
resolution which handles case sensitive filenames.

Fixes issue googlesamples#110

Bug: 79546648
Change-Id: I40d83098dc105ecd80735e08d773248ded78d9e4

Author: Stewart Miles

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 1.2.71 - May 10, 2018
+## Bug Fixes
+* Fixed resolution of Android dependencies when the `Assets/Plugins/Android`
+  directory is named in a different case e.g `Assets/plugins/Android`.
+
 # Version 1.2.70 - May 7, 2018
 ## Bug Fixes
 * Fixed bitcode flag being ignored for iOS pods.

build.gradle

@@ -153,7 +153,7 @@ project.ext {
     buildPath = file('build').absolutePath
     exportPath = file('build/plugin.unitypackage').absolutePath
     dllDir = 'Assets/PlayServicesResolver/Editor'
-    pluginVersion = '1.2.70.0'
+    pluginVersion = '1.2.71.0'
     currentPluginPath = file('.').absolutePath
     currentPluginBasename = 'play-services-resolver'
     currentPluginName = (currentPluginBasename + '-' + pluginVersion +

exploded/Assets/PlayServicesResolver/Editor.meta

@@ -16,6 +16,7 @@
 
 namespace GooglePlayServices
 {
+    using System;
     using System.IO;
     using UnityEditor;
     using UnityEngine;
@@ -105,6 +106,9 @@ internal void Save() {
 
         private static ProjectSettings projectSettings = new ProjectSettings(Namespace);
 
+        // Previously validated package directory.
+        private static string previouslyValidatedPackageDir;
+
         /// <summary>
         /// Reset settings of this plugin to default values.
         /// </summary>
@@ -132,12 +136,14 @@ internal static bool InstallAndroidPackages {
             get { return projectSettings.GetBool(PackageInstallKey, true); }
         }
 
+
         internal static string PackageDir {
             private set { projectSettings.SetString(PackageDirKey, value); }
             get {
-                return ConfigurablePackageDir ?
-                    ValidatePackageDir(projectSettings.GetString(PackageDirKey, DefaultPackageDir)) :
-                    DefaultPackageDir;
+                return ValidatePackageDir(
+                    ConfigurablePackageDir ?
+                        (projectSettings.GetString(PackageDirKey, DefaultPackageDir)) :
+                        DefaultPackageDir);
             }
         }
 
@@ -164,9 +170,32 @@ internal static bool VerboseLogging {
         }
 
         internal static string ValidatePackageDir(string directory) {
-            if (!directory.StartsWith(AndroidPluginsDir)) {
+            // Make sure the package directory starts with the same name.
+            // This is case insentitive to handle cases where developers rename Unity
+            // project directories on Windows (which has a case insensitive file system by
+            // default) then they use the project on OSX / Linux.
+            if (!directory.ToLowerInvariant().StartsWith(AndroidPluginsDir.ToLower())) {
                 directory = AndroidPluginsDir;
             }
+            var searchDirectory = FileUtils.FindDirectoryByCaseInsensitivePath(directory);
+            if (directory != searchDirectory &&
+                (previouslyValidatedPackageDir == null ||
+                 searchDirectory != previouslyValidatedPackageDir)) {
+                PlayServicesResolver.Log(
+                    String.Format("Resolving to Android package directory {0} instead of the " +
+                                  "requested target directory {1}\n" +
+                                  "\n" +
+                                  "Is {0} in a different case to {1} ?\n",
+                                  searchDirectory, directory), level: LogLevel.Warning);
+                directory = searchDirectory;
+            } else if (previouslyValidatedPackageDir == null ||
+                       searchDirectory != previouslyValidatedPackageDir){
+                PlayServicesResolver.Log(
+                    String.Format("Android package directory {0} not found.",
+                                  directory), level: LogLevel.Warning);
+            }
+            previouslyValidatedPackageDir = searchDirectory;
+
             return directory;
         }
 

exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.70.0.dll

@@ -17,6 +17,7 @@
 namespace Google {
     using System;
     using System.IO;
+    using System.Collections.Generic;
 
     /// <summary>
     /// Utility methods to assist with file management in Unity.
@@ -78,5 +79,52 @@ public static void CopyDirectory(string sourceDir, string targetDir) {
                 }
             }
         }
+
+        /// <summary>
+        /// Perform a case insensitive search for a path relative to the current directory.
+        /// </summary>
+        /// <remarks>
+        /// Directory.Exists() is case insensitive, so this method finds a directory using a case
+        /// insensitive search returning the name of the first matching directory found.
+        /// </remarks>
+        /// <param name="pathToFind">Path to find relative to the current directory.</param>
+        /// <returns>First case insensitive match for the specified path.</returns>
+        public static string FindDirectoryByCaseInsensitivePath(string pathToFind) {
+            var searchDirectory = ".";
+            // Components of the path.
+            var components = pathToFind.Replace(
+                Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar).Split(
+                    new [] { Path.DirectorySeparatorChar });
+            for (int componentIndex = 0;
+                 componentIndex < components.Length && searchDirectory != null;
+                 componentIndex++) {
+                var enumerateDirectory = searchDirectory;
+                var expectedComponent = components[componentIndex];
+                var expectedComponentLower = components[componentIndex].ToLowerInvariant();
+                searchDirectory = null;
+                var matchingPaths = new List<KeyValuePair<int, string>>();
+                foreach (var currentDirectory in
+                         Directory.GetDirectories(enumerateDirectory)) {
+                    // Get the current component of the path we're traversing.
+                    var currentComponent = Path.GetFileName(currentDirectory);
+                    if (currentComponent.ToLowerInvariant() == expectedComponentLower) {
+                        // Add the path to a list and remove "./" from the first component.
+                        matchingPaths.Add(new KeyValuePair<int, string>(
+                            Math.Abs(String.CompareOrdinal(expectedComponent, currentComponent)),
+                            (componentIndex == 0) ? Path.GetFileName(currentDirectory) :
+                                currentDirectory));
+                        break;
+                    }
+                }
+                if (matchingPaths.Count == 0) break;
+                // Sort list in order of ordinal string comparison result.
+                matchingPaths.Sort(
+                    (KeyValuePair<int, string> lhs, KeyValuePair<int, string> rhs) => {
+                        return lhs.Key - rhs.Key;
+                    });
+                searchDirectory = matchingPaths[0].Value;
+            }
+            return searchDirectory;
+        }
     }
 }