Merge "support for android packages with classifier in their namespaces."

Author: vimanyu

source/AndroidResolver/scripts/download_artifacts.gradle

@@ -439,31 +439,48 @@ public class PackageSpecifier implements Comparable {
   public String artifact = ""
   // Version expression of a maven package.
   public String versionExpression = ""
+  // Classifier of the artifact.
+  public String classifier = ""
   // Type of the artifact.
   public String artifactType = ""
 
   /*
    * Extract the components of a package specifier string.
    *
    * @param packageSpecifier Package specification.
-   *   Package specification should match agroup:apackage:version@artifacttype
-   *   e.g a.b.c:d.e:1.2.3@aar
+   *   Package specification should match one of the following formats,
+   *   - agroup:apackage:version@artifacttype
+   *     e.g a.b.c:d.e:1.2.3@aar
+   *   - agroup:apackage:version:classifier@artifacttype
+   *     e.g a.b.c:d.e:1.2.3:f@aar
    *
-   * @returns [group, artifact, version, artifactType] list with the components
+   * @returns [group, artifact, version, artifactType, classifier] list with the components
    * of the package spec.  If a component is not present the entry in the list
    * is null.
    */
   public static PackageSpecifier fromString(String packageSpecifierString) {
     List<String> components = packageSpecifierString ?
       packageSpecifierString.split(/[:@]/) : []
+    if (components.size() == 5) {
+      // Special case to handle group:artifact:version:classifier@artifactType,
+      // We want to maintain the components list as,
+      // [group, artifact, version, artifactType, classifier]
+      // because classifiers are a rare case and more often than not, the parser
+      // will find artifactType in the second to last position.
+      // Hence, if there are 5 components, swap the last two to make sure
+      // artifactType is second to last.
+      components.swap(3,4)
+    }
     // Fill the list of components with null elements.
-    components += ([""] * Math.min(4, (4 - components.size())))
+    components += ([""] * Math.min(5, (5 - components.size())))
+
     return new PackageSpecifier(
       group: components[0],
       artifact: components[1],
       versionExpression: components[2] ? (VersionRange.fromExpression(
                                             components[2])).expression : "",
-      artifactType: components[3])
+      artifactType: components[3],
+      classifier: components[4])
   }
 
   /*
@@ -508,6 +525,7 @@ public class PackageSpecifier implements Comparable {
     return resolvedArtifact.with {
       PackageSpecifier pkg = fromModuleVersionIdentifier(moduleVersion.id)
       pkg.artifactType = type
+      pkg.classifier = classifier
       return pkg
     }
   }
@@ -613,7 +631,11 @@ public class PackageSpecifier implements Comparable {
         components.add(artifact)
         if (versionExpression) {
           if (artifactType) {
-            components.add(versionExpression + "@" + artifactType)
+            if (classifier) {
+              components.add(versionExpression + ':' + classifier + "@" + artifactType)
+            } else {
+              components.add(versionExpression + "@" + artifactType)
+            }
           } else {
             components.add(versionExpression)
           }
@@ -665,6 +687,9 @@ public class PackageSpecifier implements Comparable {
     if (versionExpression) {
       hypenSeparatedComponents += [versionExpression]
     }
+    if (classifier) {
+      hypenSeparatedComponents += [classifier]
+    }
     String filename = hypenSeparatedComponents.join("-")
     if (artifactType) {
       filename += "." + (artifactType == "srcaar" ? "aar" : artifactType)
@@ -1345,6 +1370,7 @@ Tuple2<Boolean, Set<PackageSpecifier>> loosenVersionContraintsForConflicts(
       new PackageSpecifier(
         group: pkg.group,
         artifact: pkg.artifact,
+        classifier: pkg.classifier,
         versionExpression: (
           isConflicting ?
             pkg.versionRange.matchType == VersionExpressionMatchType.RANGE ?

source/AndroidResolver/scripts/download_artifacts_test.gradle

@@ -418,6 +418,21 @@ createTestTask(
   ["Copied artifacts:\n" +
    "com.android.support.support-annotations-23.0.1.magic"])
 
+ createTestTask(
+  "testDownloadAvailableWithClassifier",
+  "Downloads artifacts with one of them having a classifier in the name.",
+  "org.test.psr:classifier:1.0.1:foo@aar;" +
+  "com.android.support:support-annotations:26.1.0;",
+  ["org.test.psr.classifier-1.0.1-foo.aar":
+   "org/test/psr/classifier/1.0.1/" +
+   "org.test.psr.classifier-1.0.1-foo.aar",
+   "com.android.support.support-annotations-26.1.0.jar":
+   "com/android/support/support-annotations/26.1.0/" +
+   "support-annotations-26.1.0.jar"],
+  ["Copied artifacts:\n" +
+   "com.android.support.support-annotations-26.1.0.jar\n" +
+   "org.test.psr.classifier-1.0.1-foo.aar"])
+
 createTestTask(
   "testDownloadAvailableTwice",
   "Downloads a single artifact and it's dependencies from maven.",

source/AndroidResolver/scripts/download_artifacts_test_assets/m2repository/org/test/psr/classifier/1.0.1/classifier-1.0.1-bar.aar

@@ -0,0 +1,13 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.test.psr</groupId>
+  <artifactId>classifier</artifactId>
+  <version>1.0.1</version>
+  <packaging>aar</packaging>
+  <dependencies>
+
+  </dependencies>
+</project>
+

source/AndroidResolver/scripts/download_artifacts_test_assets/m2repository/org/test/psr/classifier/1.0.1/classifier-1.0.1-foo.aar

@@ -0,0 +1,13 @@
+<metadata>
+  <groupId>org.test.psr</groupId>
+  <artifactId>classifier</artifactId>
+  <versioning>
+    <release>1.0.1</release>
+    <versions>
+      <version>1.0.1</version>
+
+    </versions>
+    <lastUpdated/>
+  </versioning>
+</metadata>
+

source/AndroidResolver/scripts/download_artifacts_test_assets/m2repository/org/test/psr/classifier/1.0.1/classifier-1.0.1.aar

@@ -58,6 +58,7 @@ protected override bool Read(string filename, Logger logger) {
             string group = null;
             string artifact = null;
             string versionSpec = null;
+            string classifier = null;
             List<string> repositories = null;
             logger.Log(
                 String.Format("Reading Android dependency XML file {0}", filename),
@@ -79,12 +80,15 @@ protected override bool Read(string filename, Logger logger) {
                             group = null;
                             artifact = null;
                             versionSpec = null;
+                            classifier = null;
                             repositories = new List<string>();
                             // Parse a package specification in the form:
                             // group:artifact:version_spec
+                            // (or)
+                            // group:artifact:version_spec:classifier
                             var spec = reader.GetAttribute("spec") ?? "";
                             var specComponents = spec.Split(new [] { ':' });
-                            if (specComponents.Length != 3) {
+                            if (specComponents.Length != 3 && specComponents.Length != 4) {
                                 logger.Log(
                                     String.Format(
                                         "Ignoring invalid package specification '{0}' " +
@@ -96,11 +100,15 @@ protected override bool Read(string filename, Logger logger) {
                             group = specComponents[0];
                             artifact = specComponents[1];
                             versionSpec = specComponents[2];
+                            if (specComponents.Length == 4)
+                                classifier = specComponents[3];
+
                             return true;
                         } else if (!(String.IsNullOrEmpty(group) ||
                                      String.IsNullOrEmpty(artifact) ||
-                                     String.IsNullOrEmpty(versionSpec))) {
-                            svcSupport.DependOn(group, artifact, versionSpec,
+                                     String.IsNullOrEmpty(versionSpec)
+                                     )) {
+                            svcSupport.DependOn(group, artifact, versionSpec, classifier: classifier,
                                                 packageIds: androidSdkPackageIds.ToArray(),
                                                 repositories: repositories.ToArray(),
                                                 createdBy: String.Format("{0}:{1}", filename,

source/AndroidResolver/scripts/download_artifacts_test_assets/m2repository/org/test/psr/classifier/1.0.1/classifier-1.0.1.pom

@@ -8,6 +8,8 @@
         <repository>Assets/Firebase/m2repository</repository>
       </repositories>
     </androidPackage>
+    <!-- Java package specified with a classifier. -->
+    <androidPackage spec="org.test.psr:classifier:1.0.1:foo@aar"/>
     <!-- Global repository. -->
     <repositories>
       <repository>file:///my/nonexistant/test/repo</repository>

source/AndroidResolver/scripts/download_artifacts_test_assets/m2repository/org/test/psr/classifier/maven-metadata.xml

@@ -27,10 +27,10 @@ allprojects {
             url "https://maven.google.com"
         }
         maven {
-            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
-            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
             url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
@@ -49,6 +49,7 @@ dependencies {
     compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
     compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
     compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
+    compile 'org.test.psr:classifier:1.0.1:foo@aar' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:12
 // Android Resolver Dependencies End
 **DEPS**}
 

source/AndroidResolver/src/AndroidXmlDependencies.cs

@@ -33,10 +33,10 @@ allprojects {
             url "https://maven.google.com"
         }
         maven {
-            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
-            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
             url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
@@ -55,6 +55,7 @@ dependencies {
     compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
     compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
     compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
+    compile 'org.test.psr:classifier:1.0.1:foo@aar' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:12
 // Android Resolver Dependencies End
 **DEPS**}
 

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/Assets/ExternalDependencyManager/Editor/TestDependencies.xml

@@ -27,10 +27,10 @@ allprojects {
             url "https://maven.google.com"
         }
         maven {
-            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url "file:///my/nonexistant/test/repo" // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
-            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15
+            url (unityProjectPath + "/project_relative_path/repo") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17
         }
         maven {
             url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
@@ -49,6 +49,7 @@ dependencies {
     compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
     compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
     compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
+    compile 'org.test.psr:classifier:1.0.1:foo@aar' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:12
 // Android Resolver Dependencies End
 **DEPS**}
 

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/Export/Gradle/org.test.psr.classifier-1.0.1-foo.aar

@@ -0,0 +1,13 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.test.psr</groupId>
+  <artifactId>classifier</artifactId>
+  <version>1.0.1</version>
+  <packaging>aar</packaging>
+  <dependencies>
+
+  </dependencies>
+</project>
+

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/Export/GradleAddedDeps/org.test.psr.classifier-1.0.1-foo.aar

@@ -0,0 +1,13 @@
+<metadata>
+  <groupId>org.test.psr</groupId>
+  <artifactId>classifier</artifactId>
+  <versioning>
+    <release>1.0.1</release>
+    <versions>
+      <version>1.0.1</version>
+
+    </versions>
+    <lastUpdated/>
+  </versioning>
+</metadata>
+

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/Gradle/org.test.psr.classifier-1.0.1-foo.aar

@@ -467,7 +467,10 @@ private static void ValidateDependencies(IntegrationTester.TestCaseResult testCa
                     "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10"),
                 new KeyValuePair<string, string>(
                     "com.google.firebase:firebase-common:16.0.0",
-                    "Google.AndroidResolverIntegrationTests.SetupDependencies")
+                    "Google.AndroidResolverIntegrationTests.SetupDependencies"),
+                new KeyValuePair<string, string>(
+                    "org.test.psr:classifier:1.0.1:foo@aar",
+                    "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:12"),
             },
             PlayServicesResolver.GetPackageSpecs(),
             "Package Specs", testCaseResult);
@@ -476,10 +479,10 @@ private static void ValidateDependencies(IntegrationTester.TestCaseResult testCa
             new List<KeyValuePair<string, string>>() {
                 new KeyValuePair<string, string>(
                     "file:///my/nonexistant/test/repo",
-                    "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15"),
+                    "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17"),
                 new KeyValuePair<string, string>(
                     "file:///" + Path.GetFullPath("project_relative_path/repo").Replace("\\", "/"),
-                    "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:15"),
+                    "Assets/ExternalDependencyManager/Editor/TestDependencies.xml:17"),
                 new KeyValuePair<string, string>(
                     "file:///" + Path.GetFullPath(
                        "Assets/Firebase/m2repository").Replace("\\", "/"),

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/GradleArmeabiv7a/org.test.psr.classifier-1.0.1-foo.aar

@@ -49,13 +49,15 @@ public class Dependency {
         /// <param name="group">Group ID</param>
         /// <param name="artifact">Artifact ID</param>
         /// <param name="version">Version constraint.</param>
+        /// <param name="classifier">Artifact classifier.</param>
         /// <param name="packageIds">Android SDK package identifiers required for this
         /// artifact.</param>
         /// <param name="repositories">List of additional repository directories to search for
         /// this artifact.</param>
         /// <param name="createdBy">Human readable string that describes where this dependency
         /// originated.</param>
-        public Dependency(string group, string artifact, string version, string[] packageIds=null,
+        public Dependency(string group, string artifact, string version,
+                          string classifier = null, string[] packageIds=null,
                           string[] repositories=null, string createdBy=null) {
             // If the dependency was added programmatically, strip out stack frames from inside the
             // library since the developer is likely interested in where in their code the
@@ -88,6 +90,7 @@ public Dependency(string group, string artifact, string version, string[] packag
             Group = group;
             Artifact = artifact;
             Version = version;
+            Classifier = classifier;
             PackageIds = packageIds;
             Repositories = repositories;
             CreatedBy = createdBy;
@@ -101,6 +104,7 @@ public Dependency(Dependency dependency) {
             Group = dependency.Group;
             Artifact = dependency.Artifact;
             Version = dependency.Version;
+            Classifier = dependency.Classifier;
             if (dependency.PackageIds != null) {
                 PackageIds = (string[])dependency.PackageIds.Clone();
             }
@@ -133,6 +137,14 @@ public Dependency(Dependency dependency) {
         /// <value>The version.</value>
         public string Version { get; set; }
 
+        /// <summary>
+        /// Gets the classifier.
+        /// </summary>
+        /// <value>The classifier.</value>
+        public string Classifier { get; set; }
+
+        /// <summary>
+
         /// <summary>
         /// Array of Android SDK identifiers for packages that are required for this
         /// artifact.
@@ -158,7 +170,11 @@ public Dependency(Dependency dependency) {
         /// group, artifact and version constraint.
         /// </summary>
         /// <value>The key.</value>
-        public string Key { get { return Group + ":" + Artifact + ":" + Version; } }
+        public string Key { get {
+            string key = Group + ":" + Artifact + ":" + Version;
+            if (!String.IsNullOrEmpty(Classifier))
+                key += ":" + Classifier;
+            return key; } }
 
         /// <summary>
         /// Returns a <see cref="System.String"/> that represents