Mark outputDirectory lazy (#2748)

Kotlin · Nov 26, 2022 · f7691fe · f7691fe
1 parent 9ed17b6
commit f7691fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt
@@ -33,7 +33,7 @@ abstract class AbstractDokkaTask : DefaultTask() {
 
     @OutputDirectory
     val outputDirectory: Property<File> = project.objects.safeProperty<File>()
-        .safeConvention(defaultDokkaOutputDirectory())
+        .safeConvention(project.provider { defaultDokkaOutputDirectory() })
 
     @Optional
     @InputDirectory

diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt
@@ -13,6 +13,10 @@ internal inline fun <reified T : Any> Property<T?>.safeConvention(value: T): Pro
     return this.convention(value).cast()
 }
 
+internal inline fun <reified T : Any> Property<T?>.safeConvention(provider: Provider<T?>): Property<T> {
+    return this.convention(provider).cast()
+}
+
 @OptIn(ExperimentalStdlibApi::class)
 internal inline fun <reified T> Provider<T>.getSafe(): T =
     if (typeOf<T>().isMarkedNullable) orNull as T