Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Documentation classpath #4099

Merged
merged 1 commit into from
Sep 19, 2022
Merged

Fix Documentation classpath #4099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion buildSrc/src/main/java/com/google/firebase/gradle/plugins/DackkaGenerationTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.google.firebase.gradle.plugins
import java.io.File
import javax.inject.Inject
import org.gradle.api.DefaultTask
import org.gradle.api.file.FileCollection
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.provider.SetProperty
Expand Down Expand Up @@ -38,7 +39,7 @@ abstract class GenerateDocumentationTaskExtension : DefaultTask() {
abstract val dackkaJarFile: Property<File>

@get:[InputFiles Classpath]
abstract val dependencies: ListProperty<File>
abstract val dependencies: Property<FileCollection>

@get:InputFiles
@get:PathSensitive(PathSensitivity.RELATIVE)
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/java/com/google/firebase/gradle/plugins/Metalava.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.FileCollection
import org.gradle.api.provider.Property
import org.gradle.api.provider.SetProperty
import org.gradle.api.tasks.Classpath
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.InputFiles
Expand Down Expand Up @@ -68,7 +69,7 @@ abstract class GenerateStubsTask : DefaultTask() {
@get:InputFiles
abstract val sources: SetProperty<File>

@get:InputFiles
@get:[InputFiles Classpath]
lateinit var classPath: FileCollection

@get:OutputDirectory
Expand Down
3 changes: 1 addition & 2 deletions buildSrc/src/main/java/com/google/firebase/gradle/plugins/ProjectUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down