Fix dependency type resolution. (#489)

Author: vkryachko

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java

@@ -24,6 +24,8 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.UnknownDomainObjectException;
+import org.gradle.api.internal.provider.DefaultProvider;
+import org.gradle.api.provider.Property;
 import org.gradle.api.publish.maven.MavenPom;
 
 public class FirebaseLibraryExtension {
@@ -39,6 +41,9 @@ public class FirebaseLibraryExtension {
   /** Firebase Test Lab configuration/ */
   public final FirebaseTestLabExtension testLab;
 
+  public Property<String> groupId;
+  public Property<String> artifactId;
+
   private Action<MavenPom> customizePomAction =
       pom -> {
         pom.licenses(
@@ -60,6 +65,16 @@ public class FirebaseLibraryExtension {
   public FirebaseLibraryExtension(Project project) {
     this.project = project;
     this.testLab = new FirebaseTestLabExtension(project.getObjects());
+    this.artifactId = project.getObjects().property(String.class);
+    this.groupId = project.getObjects().property(String.class);
+
+    if ("ktx".equals(project.getName()) && project.getParent() != null) {
+      artifactId.set(new DefaultProvider<>(() -> project.getParent().getName() + "-ktx"));
+      groupId.set(new DefaultProvider<>(() -> project.getParent().getGroup().toString()));
+    } else {
+      artifactId.set(new DefaultProvider<>(project::getName));
+      groupId.set(new DefaultProvider<>(() -> project.getGroup().toString()));
+    }
   }
 
   /** Configure Firebase Test Lab. */

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/publish/Publisher.groovy

@@ -14,6 +14,7 @@
 
 package com.google.firebase.gradle.plugins.publish
 
+import com.google.firebase.gradle.plugins.FirebaseLibraryExtension
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -28,7 +29,7 @@ class Publisher {
         RELEASE,
         SNAPSHOT
     }
-    private final Mode mode;
+    private final Mode mode
     private final Set<Project> projectsToPublish
 
     Publisher(Mode mode, Set<Project> projectsToPublish) {
@@ -93,27 +94,33 @@ class Publisher {
         dummyDependencyConfiguration.dependencies.addAll(nonProjectDependencies)
         try {
             return project.configurations.releaseRuntimeClasspath.getAllDependencies().collectEntries {
-                [("$it.group:$it.name" as String): getType(dummyDependencyConfiguration, it)]
+                getType(dummyDependencyConfiguration, it)
             }
         } finally {
             project.configurations.remove(dummyDependencyConfiguration)
         }
 
     }
 
-    private static String getType(Configuration config, Dependency d) {
+    private static def getType(Configuration config, Dependency d) {
         if (d instanceof ProjectDependency) {
             // we currently only support aar libraries to be produced in this repository
-            return 'aar'
+            def library = getFirebaseLibrary(d.dependencyProject)
+            return [("${library.groupId.get()}:${library.artifactId.get()}" as String): 'aar']
         }
         String path = config.find {
             it.absolutePath.matches(".*\\Q$d.group/$d.name/$d.version/\\E[a-zA-Z0-9]+/\\Q$d.name-$d.version.\\E[aj]ar")
         }?.absolutePath
+
         if (path && path.endsWith (".aar")) {
-            return "aar"
+            return [("$d.group:$d.name" as String): 'aar']
         } else {
-            return "jar"
+            return [("$d.group:$d.name" as String): 'jar']
         }
     }
 
+    private static FirebaseLibraryExtension getFirebaseLibrary(Project project) {
+        return project.extensions.getByType(FirebaseLibraryExtension.class);
+    }
+
 }

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/publish/PublishingPlugin.groovy

@@ -108,12 +108,9 @@ class PublishingPlugin implements Plugin<Project> {
                     publications {
                         mavenAar(MavenPublication) {
                             from sub.components.android
-                            // TODO(vkryachko): move it to a more appropriate place once the
-                            // FirebaseLibraryPlugin migration is complete
-                            if (sub.name == 'ktx') {
-                                artifactId = "$sub.parent.name-ktx"
-                                groupId = sub.parent.group
-                            }
+
+                            artifactId = firebaseLibrary.artifactId.get()
+                            groupId = firebaseLibrary.groupId.get()
                             if (firebaseLibrary.publishSources) {
                                 artifact sub.tasks.create("sourcesJar", Jar) {
                                     from sub.android.sourceSets.main.java.srcDirs