Fix Documentation classpath

vkryachko · vkryachko · commit 98738d9fabf6 · 2022-09-15T10:21:33.000-04:00
b/241795594
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.java
@@ -165,7 +165,8 @@ private static void setupApiInformationAnalysis(Project project) {
                           config.attributes(
                               container ->
                                   container.attribute(
-                                      Attribute.of("artifactType", String.class), "jar")))
+                                      Attribute.of("artifactType", String.class),
+                                      "android-classes")))
                   .getArtifacts()
                   .getArtifactFiles();
 
diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
@@ -50,8 +50,7 @@ val Project.dackkaConfig: Configuration
  */
 fun Configuration.getJars() = incoming.artifactView {
     attributes {
-        // TODO(b/241795594): replace value with android-class instead of jar after agp upgrade
-        attribute(Attribute.of("artifactType", String::class.java), "jar")
+        attribute(Attribute.of("artifactType", String::class.java), "android-classes")
     }
 }.artifacts.artifactFiles
 

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ val Project.dackkaConfig: Configuration`
`50`	`50`	`*/`
`51`	`51`	`fun Configuration.getJars() = incoming.artifactView {`
`52`	`52`	`attributes {`
`53`		`- // TODO(b/241795594): replace value with android-class instead of jar after agp upgrade`
`54`		`- attribute(Attribute.of("artifactType", String::class.java), "jar")`
	`53`	`+ attribute(Attribute.of("artifactType", String::class.java), "android-classes")`
`55`	`54`	`}`
`56`	`55`	`}.artifacts.artifactFiles`
`57`	`56`