From ef02b473485826fd90b270249534c6a228a78a14 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 26 Jan 2023 22:25:33 +0100 Subject: [PATCH] Update Dokka to 1.8.0-dev-195 - Build dokka plugins with Kotlin 1.8 (required to compile with Dokka 1.8) --- libraries/tools/kotlin-stdlib-docs/gradle.properties | 2 +- .../dokka-samples-transformer-plugin/build.gradle | 2 +- .../dokka-stdlib-configuration-plugin/build.gradle | 2 +- .../dokka/kotlinlang/StdLibConfigurationPlugin.kt | 9 +++++++-- .../plugins/dokka-version-filter-plugin/build.gradle | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-stdlib-docs/gradle.properties b/libraries/tools/kotlin-stdlib-docs/gradle.properties index 57522492012..f72fc7de490 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.7.20-dev-187 +dokka_version=1.8.0-dev-195 systemProp.dokka.shouldDisplaySinceKotlin=true \ No newline at end of file diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle index 3e53f875e83..78634a3b825 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-samples-transformer-plugin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.6.10' + id 'org.jetbrains.kotlin.jvm' version '1.8.0' } description "Dokka Plugin to transform the samples from stdlib" diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle index 29605de919a..6f793ba4b3c 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.6.10' + id 'org.jetbrains.kotlin.jvm' version '1.8.0' } description "Dokka Plugin to configure Dokka for stdlib" 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 7ac2c5fbcf2..1757fefd3c3 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 @@ -1,9 +1,14 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + package org.jetbrains.dokka.kotlinlang import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.analysis.DokkaAnalysisConfiguration -import org.jetbrains.dokka.analysis.KotlinAnalysis +import org.jetbrains.dokka.analysis.ProjectKotlinAnalysis import org.jetbrains.dokka.plugability.configuration class StdLibConfigurationPlugin : DokkaPlugin() { @@ -13,7 +18,7 @@ class StdLibConfigurationPlugin : DokkaPlugin() { val stdLibKotlinAnalysis by extending { dokkaBase.kotlinAnalysis providing { ctx -> val ignoreCommonBuiltIns = configuration(ctx)?.ignoreCommonBuiltIns ?: false - KotlinAnalysis( + ProjectKotlinAnalysis( sourceSets = ctx.configuration.sourceSets, logger = ctx.logger, analysisConfiguration = DokkaAnalysisConfiguration(ignoreCommonBuiltIns = ignoreCommonBuiltIns) diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle index f1870106746..30e50754c66 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-version-filter-plugin/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.6.10' + id 'org.jetbrains.kotlin.jvm' version '1.8.0' } description "Dokka Plugin to filter version for stdlib"