diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle.kts b/libraries/tools/kotlin-stdlib-docs/build.gradle.kts index 2612b0fab2c..c1c755969b0 100644 --- a/libraries/tools/kotlin-stdlib-docs/build.gradle.kts +++ b/libraries/tools/kotlin-stdlib-docs/build.gradle.kts @@ -365,7 +365,7 @@ fun createAllLibsVersionedDocTask(version: String, isLatest: Boolean, vararg lib libTasks.forEach { addChildTask(it.name) } fileLayout.set(DokkaMultiModuleFileLayout { parent, child -> - parent.outputDirectory.get().resolve(child.moduleName.get()) + parent.outputDirectory.dir(child.moduleName) }) val moduleDirName = "all-libs" diff --git a/libraries/tools/kotlin-stdlib-docs/gradle.properties b/libraries/tools/kotlin-stdlib-docs/gradle.properties index f72fc7de490..5d4250bef67 100644 --- a/libraries/tools/kotlin-stdlib-docs/gradle.properties +++ b/libraries/tools/kotlin-stdlib-docs/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs=-Xmx6G -dokka_version=1.8.0-dev-195 +dokka_version=1.8.20-dev-213 systemProp.dokka.shouldDisplaySinceKotlin=true \ No newline at end of file diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/SamplesTransformerPlugin.kt b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/SamplesTransformerPlugin.kt index 06976e1bb92..a9b03f5f75d 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/SamplesTransformerPlugin.kt +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/SamplesTransformerPlugin.kt @@ -3,6 +3,8 @@ package org.jetbrains.dokka.kotlinlang import org.jetbrains.dokka.CoreExtensions import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin +import org.jetbrains.dokka.plugability.DokkaPluginApiPreview +import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement class SamplesTransformerPlugin : DokkaPlugin() { private val dokkaBase by lazy { plugin() } @@ -13,4 +15,7 @@ class SamplesTransformerPlugin : DokkaPlugin() { before(dokkaBase.pageMerger) } } + + @DokkaPluginApiPreview + override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement } \ No newline at end of file diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt index 1757fefd3c3..cee34a67529 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt @@ -9,6 +9,8 @@ import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.analysis.DokkaAnalysisConfiguration import org.jetbrains.dokka.analysis.ProjectKotlinAnalysis +import org.jetbrains.dokka.plugability.DokkaPluginApiPreview +import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement import org.jetbrains.dokka.plugability.configuration class StdLibConfigurationPlugin : DokkaPlugin() { @@ -25,4 +27,7 @@ class StdLibConfigurationPlugin : DokkaPlugin() { ) } override dokkaBase.defaultKotlinAnalysis } + + @DokkaPluginApiPreview + override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement } \ No newline at end of file diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/VersionFilterPlugin.kt b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/VersionFilterPlugin.kt index 8cbbc96ca8b..4e3e4c8f207 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/VersionFilterPlugin.kt +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/VersionFilterPlugin.kt @@ -3,6 +3,8 @@ package org.jetbrains.dokka.kotlinlang import org.jetbrains.dokka.CoreExtensions import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin +import org.jetbrains.dokka.plugability.DokkaPluginApiPreview +import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement class VersionFilterPlugin : DokkaPlugin() { @@ -16,4 +18,8 @@ class VersionFilterPlugin : DokkaPlugin() { before(dokkaBase.inheritorsExtractor) } } + + @DokkaPluginApiPreview + override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement + } \ No newline at end of file