From fc86d2125db751fcb93ed25e1d8e87577adcaa6a Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Mon, 20 Jun 2022 16:17:20 +0200 Subject: Update documentation and examples to Dokka 1.7.0 (#2542) --- examples/gradle/dokka-customFormat-example/build.gradle.kts | 6 +++--- examples/gradle/dokka-gradle-example/build.gradle.kts | 4 ++-- examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts | 10 +++++----- .../gradle/dokka-library-publishing-example/build.gradle.kts | 4 ++-- examples/gradle/dokka-multimodule-example/settings.gradle.kts | 4 ++-- examples/gradle/dokka-multiplatform-example/build.gradle.kts | 4 ++-- .../dokka-versioning-multimodule-example/build.gradle.kts | 6 +++--- .../parentProject/build.gradle.kts | 6 +++--- examples/maven/pom.xml | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'examples') diff --git a/examples/gradle/dokka-customFormat-example/build.gradle.kts b/examples/gradle/dokka-customFormat-example/build.gradle.kts index 68a3368a..a965b7bf 100644 --- a/examples/gradle/dokka-customFormat-example/build.gradle.kts +++ b/examples/gradle/dokka-customFormat-example/build.gradle.kts @@ -1,13 +1,13 @@ import org.jetbrains.dokka.gradle.DokkaTask plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") } buildscript { dependencies { - classpath("org.jetbrains.dokka:dokka-base:1.6.21") + classpath("org.jetbrains.dokka:dokka-base:1.7.0") } } diff --git a/examples/gradle/dokka-gradle-example/build.gradle.kts b/examples/gradle/dokka-gradle-example/build.gradle.kts index 98ef812e..68b80dfe 100644 --- a/examples/gradle/dokka-gradle-example/build.gradle.kts +++ b/examples/gradle/dokka-gradle-example/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") } repositories { diff --git a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts index 6c36c01e..61385606 100644 --- a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts +++ b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") } repositories { @@ -12,11 +12,11 @@ dependencies { testImplementation(kotlin("test-junit")) // Will apply the plugin to all dokka tasks - dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21") + dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.7.0") // Will apply the plugin only to the `:dokkaHtml` task - //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21") + //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.7.0") // Will apply the plugin only to the `:dokkaGfm` task - //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21") + //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.7.0") } diff --git a/examples/gradle/dokka-library-publishing-example/build.gradle.kts b/examples/gradle/dokka-library-publishing-example/build.gradle.kts index 75407ab1..8d2a4aa2 100644 --- a/examples/gradle/dokka-library-publishing-example/build.gradle.kts +++ b/examples/gradle/dokka-library-publishing-example/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") `java-library` `maven-publish` } diff --git a/examples/gradle/dokka-multimodule-example/settings.gradle.kts b/examples/gradle/dokka-multimodule-example/settings.gradle.kts index e26c3600..fa6e1a23 100644 --- a/examples/gradle/dokka-multimodule-example/settings.gradle.kts +++ b/examples/gradle/dokka-multimodule-example/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") } } diff --git a/examples/gradle/dokka-multiplatform-example/build.gradle.kts b/examples/gradle/dokka-multiplatform-example/build.gradle.kts index 016c7527..a4cd74bd 100644 --- a/examples/gradle/dokka-multiplatform-example/build.gradle.kts +++ b/examples/gradle/dokka-multiplatform-example/build.gradle.kts @@ -4,8 +4,8 @@ import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.Platform plugins { - kotlin("multiplatform") version "1.6.21" - id("org.jetbrains.dokka") version "1.6.21" + kotlin("multiplatform") version "1.7.0" + id("org.jetbrains.dokka") version "1.7.0" } repositories { diff --git a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts index 3eeedb79..a62a7fa5 100644 --- a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts +++ b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "1.6.21" - id("org.jetbrains.dokka") version ("1.6.21") apply false + kotlin("jvm") version "1.7.0" + id("org.jetbrains.dokka") version ("1.7.0") apply false } // The versioning plugin should be applied in all submodules @@ -14,6 +14,6 @@ subprojects { } val dokkaPlugin by configurations dependencies { - dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.6.21") + dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.7.0") } } diff --git a/examples/gradle/dokka-versioning-multimodule-example/parentProject/build.gradle.kts b/examples/gradle/dokka-versioning-multimodule-example/parentProject/build.gradle.kts index 5ef330cf..83f7f474 100644 --- a/examples/gradle/dokka-versioning-multimodule-example/parentProject/build.gradle.kts +++ b/examples/gradle/dokka-versioning-multimodule-example/parentProject/build.gradle.kts @@ -9,8 +9,8 @@ val olderVersionsFolder = "olderVersions" // The previously documentations should be generated with the versioning plugin val generatePreviouslyDocTask by tasks.register("dokkaPreviouslyDocumentation") { dependencies { - dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:1.6.21") - dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.6.21") + dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:1.7.0") + dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.7.0") } val configuredVersion = "0.9" outputDirectory.set(file(projectDir.toPath().resolve(olderVersionsFolder).resolve(configuredVersion))) @@ -22,4 +22,4 @@ tasks.dokkaHtmlMultiModule { dependsOn(generatePreviouslyDocTask) val configuredVersion = "1.0" pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.versioning.VersioningPlugin" to """{ "version": "$configuredVersion", "olderVersionsDir": "$projectDir/$olderVersionsFolder" }""")) -} \ No newline at end of file +} diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index 8e3d0c27..4c3049fc 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,8 +8,8 @@ kotlin-maven-example 1.0-SNAPSHOT - 1.6.21 - 1.6.21 + 1.7.0 + 1.7.0 -- cgit