Update Dokka to 1.8.20-dev-213

(cherry picked from commit 36cb94c)
JetBrains · Apr 27, 2023 · 0043ae4 · 0043ae4
1 parent 0389c35
commit 0043ae4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle.kts b/libraries/tools/kotlin-stdlib-docs/build.gradle.kts
@@ -356,7 +356,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
@@ -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
diff --git a/...sformer-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/SamplesTransformerPlugin.kt b/...sformer-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<DokkaBase>() }
@@ -13,4 +15,7 @@ class SamplesTransformerPlugin : DokkaPlugin() {
             before(dokkaBase.pageMerger)
         }
     }
+
+    @DokkaPluginApiPreview
+    override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement
 }
diff --git a/...ration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt b/...ration-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
 }
diff --git a/...rsion-filter-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/VersionFilterPlugin.kt b/...rsion-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
+
 }