Skip to content

Commit f599591

Browse files
committed
Fix toc.yaml path.
1 parent 63bbec5 commit f599591

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.gradle.api.provider.Property
88
import org.gradle.api.provider.SetProperty
99
import org.gradle.api.tasks.CacheableTask
1010
import org.gradle.api.tasks.Classpath
11+
import org.gradle.api.tasks.Input
1112
import org.gradle.api.tasks.InputFile
1213
import org.gradle.api.tasks.InputFiles
1314
import org.gradle.api.tasks.OutputDirectory
@@ -19,7 +20,6 @@ import org.gradle.workers.WorkAction
1920
import org.gradle.workers.WorkParameters
2021
import org.gradle.workers.WorkerExecutor
2122
import org.json.JSONObject
22-
2323
/**
2424
* Extension class for [GenerateDocumentationTask].
2525
*
@@ -56,6 +56,9 @@ abstract class GenerateDocumentationTaskExtension : DefaultTask() {
5656
@get:PathSensitive(PathSensitivity.RELATIVE)
5757
abstract val packageListFiles: ListProperty<File>
5858

59+
@get:Input
60+
abstract val clientName: Property<String>
61+
5962
@get:OutputDirectory
6063
abstract val outputDirectory: Property<File>
6164
}
@@ -89,7 +92,7 @@ abstract class GenerateDocumentationTask @Inject constructor(
8992
@TaskAction
9093
fun build() {
9194
val configFile = saveToJsonFile(constructArguments())
92-
launchDackka(configFile, workerExecutor)
95+
launchDackka(clientName, configFile, workerExecutor)
9396
}
9497

9598
private fun constructArguments(): JSONObject {
@@ -142,13 +145,13 @@ abstract class GenerateDocumentationTask @Inject constructor(
142145
return outputFile
143146
}
144147

145-
private fun launchDackka(argsFile: File, workerExecutor: WorkerExecutor) {
148+
private fun launchDackka(clientName: Property<String>, argsFile: File, workerExecutor: WorkerExecutor) {
146149
val workQueue = workerExecutor.noIsolation()
147150

148151
workQueue.submit(DackkaWorkAction::class.java) {
149152
args.set(listOf(argsFile.path, "-loggingLevel", "WARN"))
150153
classpath.set(setOf(dackkaJarFile.get()))
151-
projectName.set(project.name)
154+
projectName.set(clientName)
152155
}
153156
}
154157
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ abstract class DackkaPlugin : Plugin<Project> {
5454
}
5555
}
5656

57+
fun <T> Project.firebaseConfigValue(getter: FirebaseLibraryExtension.() -> T): T =
58+
project.extensions.getByType<FirebaseLibraryExtension>().getter()
59+
5760
private fun shouldWePublish(project: Project) =
58-
project.extensions.getByType<FirebaseLibraryExtension>().publishJavadoc
61+
project.firebaseConfigValue { publishJavadoc }
5962

6063
private fun prepareJavadocConfiguration(project: Project) {
6164
val javadocConfig = project.javadocConfig
@@ -88,6 +91,7 @@ abstract class DackkaPlugin : Plugin<Project> {
8891
}
8992

9093
docsTask.configure {
94+
clientName.set(project.firebaseConfigValue { artifactId })
9195
// this will become useful with the agp upgrade, as they're separate in 7.x+
9296
val sourcesForKotlin = emptyList<File>()
9397
val packageLists = fetchPackageLists(project)

0 commit comments

Comments
 (0)