Moving the local repo .aar file to .srcaar.

This accomodates Unity adding aars regardless of being in the Editor
directory.  The jar resolver plugin handles renaming .srcaar to .aar.

Also, fixes an issue with metadata tagging files that have no labels.
As a result, the 1.0.1 manifest has to be added to remove the old
.aar files.

Change-Id: I5e038e5731ee8ba33fcbcd34c6641d7e6ede8504

Author: claywilkinson

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt

@@ -0,0 +1,27 @@
+Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5
+Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1
+Assets/GoogleSignIn/Future.cs
+Assets/GoogleSignIn/GoogleSignIn.cs
+Assets/GoogleSignIn/GoogleSignInConfiguration.cs
+Assets/GoogleSignIn/GoogleSignInStatusCode.cs
+Assets/GoogleSignIn/GoogleSignInUser.cs
+Assets/GoogleSignIn/Impl/BaseObject.cs
+Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
+Assets/GoogleSignIn/Impl/NativeFuture.cs
+Assets/GoogleSignIn/Impl/SignInHelperObject.cs
+Assets/Parse/LICENSE
+Assets/Parse/Plugins/Unity.Compat.dll
+Assets/Parse/Plugins/Unity.Tasks.dll
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll
+Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt
+Assets/Plugins/Android/native-googlesignin-release.aar
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
+Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta

@@ -66,7 +66,7 @@ project.ext {
         git_exe = 'git'
     }
 
-    pluginVersion = "1.0.1"
+    pluginVersion = "1.0.2"
     currentPluginBasename = 'google-signin-plugin'
     currentPluginName = (currentPluginBasename + '-' + pluginVersion +
                                      '.unitypackage')
@@ -297,14 +297,25 @@ task inject_versionIntoMetaFiles() {
   doLast {
     for (fileobj in fileTree("${pluginProjectPath}")) {
       if (fileobj.path.endsWith('.meta')) {
+        // Skip the manifest files for any previous versions
+        if (fileobj.path.contains("Editor/${currentPluginBasename}")) {
+          continue
+        }
         def lines = fileobj.text.split('\n')
         def outputLines = []
+        def added = false
         for (line in lines) {
           outputLines.add(line)
           if (line.contains('labels:')) {
             outputLines.add("- gvh_v${pluginVersion}")
+            added = true
+          } else if (line.contains('folderAsset:') && line.contains('yes')) {
+            added = true
           }
         }
+        if (!added) {
+          outputLines.add("labels:\n- gvh_v${pluginVersion}")
+        }
         fileobj.write(outputLines.join('\n') + '\n')
       }
     }

GoogleSignInPlugin/Assets/SignInSample.meta

@@ -29,14 +29,16 @@ if (project.hasProperty("uploadDir")) {
   project.ext.uploadDir = "${buildDir}/m2repository"
 }
 
+project.ext.baseName = "google-signin-support"
+
 android {
     compileSdkVersion 26
     buildToolsVersion "25.0.3"
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
         versionName project.version
-        archivesBaseName = 'google-signin-support'
+        archivesBaseName = project.ext.baseName
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11", "-Wall"
@@ -59,10 +61,48 @@ android {
     }
 }
 
+// Rename the .aar file to be .srcaar to work around
+// having the local repo in a subdirectory in a Unity project.
+// The jar resolver plugin handles the changing back from .srcaar
+// to .aar
+//
+// This is done in 2 parts, first declare the .srcaar as an
+// artifact, the second is a task to rename the aar -> srcaar.
+
+artifacts {
+    archives file("build/${baseName}-${version}.srcaar")
+}
+
+task renameLibrary() {
+  doFirst {
+    copy {
+      from "${buildDir}/outputs/aar/${baseName}-release.aar"
+     into "${buildDir}"
+      rename {
+        String fn ->
+          return fn.replace("release.aar", "${version}.srcaar")
+      }
+    }
+  }
+
+  doLast {
+    configurations.archives.with   {
+         artifacts.remove artifacts.find { it.extension == "aar"}
+      }
+  }
+}
+
 uploadArchives {
+  dependsOn renameLibrary
   repositories {
     mavenDeployer {
       repository(url: uri(project.ext.uploadDir))
+
+      // Remove the dependencies from the pom file to simplify the
+      // the resolution process.
+      pom.whenConfigured {
+        p -> p.dependencies = []
+      }
     }
   }
 }