Update Dokka to 1.8.20-dev-213

ilya-g · Space Team · commit 36cb94c158e2 · 2023-04-19T10:28:07.000Z
diff --git 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
@@ -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/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<DokkaBase>() }
@@ -13,4 +15,7 @@ class SamplesTransformerPlugin : DokkaPlugin() {
             before(dokkaBase.pageMerger)
         }
     }
+
+    @DokkaPluginApiPreview
+    override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement
 }
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
@@ -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/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
+
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ package org.jetbrains.dokka.kotlinlang`
`3`	`3`	`import org.jetbrains.dokka.CoreExtensions`
`4`	`4`	`import org.jetbrains.dokka.base.DokkaBase`
`5`	`5`	`import org.jetbrains.dokka.plugability.DokkaPlugin`
	`6`	`+import org.jetbrains.dokka.plugability.DokkaPluginApiPreview`
	`7`	`+import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement`
`6`	`8`
`7`	`9`	`class SamplesTransformerPlugin : DokkaPlugin() {`
`8`	`10`	`private val dokkaBase by lazy { plugin<DokkaBase>() }`
`@@ -13,4 +15,7 @@ class SamplesTransformerPlugin : DokkaPlugin() {`
`13`	`15`	`before(dokkaBase.pageMerger)`
`14`	`16`	`}`
`15`	`17`	`}`
	`18`	`+`
	`19`	`+ @DokkaPluginApiPreview`
	`20`	`+ override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ import org.jetbrains.dokka.base.DokkaBase`
`9`	`9`	`import org.jetbrains.dokka.plugability.DokkaPlugin`
`10`	`10`	`import org.jetbrains.dokka.analysis.DokkaAnalysisConfiguration`
`11`	`11`	`import org.jetbrains.dokka.analysis.ProjectKotlinAnalysis`
	`12`	`+import org.jetbrains.dokka.plugability.DokkaPluginApiPreview`
	`13`	`+import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement`
`12`	`14`	`import org.jetbrains.dokka.plugability.configuration`
`13`	`15`
`14`	`16`	`class StdLibConfigurationPlugin : DokkaPlugin() {`
`@@ -25,4 +27,7 @@ class StdLibConfigurationPlugin : DokkaPlugin() {`
`25`	`27`	`)`
`26`	`28`	`} override dokkaBase.defaultKotlinAnalysis`
`27`	`29`	`}`
	`30`	`+`
	`31`	`+ @DokkaPluginApiPreview`
	`32`	`+ override fun pluginApiPreviewAcknowledgement(): PluginApiPreviewAcknowledgement = PluginApiPreviewAcknowledgement`
`28`	`33`	`}`