Skip to content

Commit c33d29e

Browse files
committed
Fix Documentation classpath
b/241795594
1 parent 6bc2882 commit c33d29e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.google.firebase.gradle.plugins
33
import java.io.File
44
import javax.inject.Inject
55
import org.gradle.api.DefaultTask
6+
import org.gradle.api.file.FileCollection
67
import org.gradle.api.provider.ListProperty
78
import org.gradle.api.provider.Property
89
import org.gradle.api.provider.SetProperty
@@ -38,7 +39,7 @@ abstract class GenerateDocumentationTaskExtension : DefaultTask() {
3839
abstract val dackkaJarFile: Property<File>
3940

4041
@get:[InputFiles Classpath]
41-
abstract val dependencies: ListProperty<File>
42+
abstract val dependencies: Property<FileCollection>
4243

4344
@get:InputFiles
4445
@get:PathSensitive(PathSensitivity.RELATIVE)

buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import org.gradle.api.artifacts.Configuration
2323
import org.gradle.api.file.FileCollection
2424
import org.gradle.api.provider.Property
2525
import org.gradle.api.provider.SetProperty
26+
import org.gradle.api.tasks.Classpath
2627
import org.gradle.api.tasks.Input
2728
import org.gradle.api.tasks.InputFile
2829
import org.gradle.api.tasks.InputFiles
@@ -68,7 +69,7 @@ abstract class GenerateStubsTask : DefaultTask() {
6869
@get:InputFiles
6970
abstract val sources: SetProperty<File>
7071

71-
@get:InputFiles
72+
@get:[InputFiles Classpath]
7273
lateinit var classPath: FileCollection
7374

7475
@get:OutputDirectory

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ val Project.dackkaConfig: Configuration
5050
*/
5151
fun Configuration.getJars() = incoming.artifactView {
5252
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")
5554
}
5655
}.artifacts.artifactFiles
5756

0 commit comments

Comments
 (0)