diff --git a/README.md b/README.md index 606b52eee4..45a747af58 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ and can generate documentation in multiple formats including standard Javadoc, H ## Using Dokka -**Full documentation is available at [https://kotlin.github.io/dokka/1.5.30/](https://kotlin.github.io/dokka/1.5.30/)** +**Full documentation is available at [https://kotlin.github.io/dokka/1.6.0/](https://kotlin.github.io/dokka/1.6.0/)** ### Using the Gradle plugin _Note: If you are upgrading from 0.10.x to a current release of Dokka, please have a look at our @@ -18,7 +18,7 @@ The preferred way is to use `plugins` block. build.gradle.kts: ```kotlin plugins { - id("org.jetbrains.dokka") version "1.5.30" + id("org.jetbrains.dokka") version "1.6.0" } repositories { @@ -33,7 +33,7 @@ Dokka plugin creates Gradle configuration for each output format in the form of ```kotlin dependencies { - dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") } ``` @@ -42,7 +42,7 @@ You can also create a custom Dokka task and add plugins directly inside: ```kotlin val customDokkaTask by creating(DokkaTask::class) { dependencies { - plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") } } ``` diff --git a/docs/src/doc/docs/community/plugins-list.md b/docs/src/doc/docs/community/plugins-list.md index 01a4bc0a84..9323bacb5a 100644 --- a/docs/src/doc/docs/community/plugins-list.md +++ b/docs/src/doc/docs/community/plugins-list.md @@ -9,7 +9,7 @@ In order to add your plugin to this list it needs to be: | Plugin name | Description | Source | | :--------- | :--------- | :------------ | -| [Kotlin as Java](https://kotlin.github.io/dokka/1.5.30/user_guide/introduction/#plugins) | Display Kotlin code as seen from Java | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/kotlin-as-java) -| [GFM](https://kotlin.github.io/dokka/1.5.30/user_guide/introduction/#plugins) | Renders documentation in a GFM format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/gfm) -| [Javadoc](https://kotlin.github.io/dokka/1.5.30/user_guide/introduction/#plugins) | Renders documentation in a Javadoc format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/javadoc) -| [Jekyll](https://kotlin.github.io/dokka/1.5.30/user_guide/introduction/#plugins) | Renders documentation in a Jekyll format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/jekyll) +| [Kotlin as Java](https://kotlin.github.io/dokka/1.6.0/user_guide/introduction/#plugins) | Display Kotlin code as seen from Java | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/kotlin-as-java) +| [GFM](https://kotlin.github.io/dokka/1.6.0/user_guide/introduction/#plugins) | Renders documentation in a GFM format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/gfm) +| [Javadoc](https://kotlin.github.io/dokka/1.6.0/user_guide/introduction/#plugins) | Renders documentation in a Javadoc format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/javadoc) +| [Jekyll](https://kotlin.github.io/dokka/1.6.0/user_guide/introduction/#plugins) | Renders documentation in a Jekyll format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/jekyll) diff --git a/docs/src/doc/docs/user_guide/gradle/usage.md b/docs/src/doc/docs/user_guide/gradle/usage.md index 4af6c97719..cc36329d75 100644 --- a/docs/src/doc/docs/user_guide/gradle/usage.md +++ b/docs/src/doc/docs/user_guide/gradle/usage.md @@ -14,7 +14,7 @@ The preferred way is to use `plugins` block. build.gradle.kts: ```kotlin plugins { - id("org.jetbrains.dokka") version "1.5.30" + id("org.jetbrains.dokka") version "1.6.0" } repositories { @@ -237,7 +237,7 @@ Dokka plugin creates Gradle configuration for each output format in the form of ```kotlin dependencies { - dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") } ``` @@ -246,7 +246,7 @@ You can also create a custom Dokka task and add plugins directly inside: ```kotlin val customDokkaTask by creating(DokkaTask::class) { dependencies { - plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") } } ``` @@ -279,7 +279,7 @@ For example, you can add `DokkaBase` to gain access to aforementioned configurat buildscript { dependencies { // classpath(":") - classpath("org.jetbrains.dokka:dokka-base:1.5.30") + classpath("org.jetbrains.dokka:dokka-base:1.6.0") } } ``` diff --git a/examples/gradle/dokka-customFormat-example/build.gradle.kts b/examples/gradle/dokka-customFormat-example/build.gradle.kts index 8aa3e1ab02..dd17795b30 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.5.30" - id("org.jetbrains.dokka") version ("1.5.30") + kotlin("jvm") version "1.6.0" + id("org.jetbrains.dokka") version ("1.6.0") } buildscript { dependencies { - classpath("org.jetbrains.dokka:dokka-base:1.5.30") + classpath("org.jetbrains.dokka:dokka-base:1.6.0") } } diff --git a/examples/gradle/dokka-gradle-example/build.gradle.kts b/examples/gradle/dokka-gradle-example/build.gradle.kts index 3166b5732d..8852cc9287 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.5.30" - id("org.jetbrains.dokka") version ("1.5.30") + kotlin("jvm") version "1.6.0" + id("org.jetbrains.dokka") version ("1.6.0") } repositories { diff --git a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts index e1c35540c6..a22aa1d9c7 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.5.30" - id("org.jetbrains.dokka") version ("1.5.30") + kotlin("jvm") version "1.6.0" + id("org.jetbrains.dokka") version ("1.6.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.5.30") + dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") // Will apply the plugin only to the `:dokkaHtml` task - //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") // Will apply the plugin only to the `:dokkaGfm` task - //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.5.30") + //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0") } diff --git a/examples/gradle/dokka-library-publishing-example/build.gradle.kts b/examples/gradle/dokka-library-publishing-example/build.gradle.kts index bd1a817523..14cb1c323f 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.5.30" - id("org.jetbrains.dokka") version ("1.5.30") + kotlin("jvm") version "1.6.0" + id("org.jetbrains.dokka") version ("1.6.0") `java-library` `maven-publish` } diff --git a/examples/gradle/dokka-multiplatform-example/build.gradle.kts b/examples/gradle/dokka-multiplatform-example/build.gradle.kts index 859e0ebb0c..efbee91ec1 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.5.30" - id("org.jetbrains.dokka") version "1.5.30" + kotlin("multiplatform") version "1.6.0" + id("org.jetbrains.dokka") version "1.6.0" } repositories { diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index 18b36715e4..888ca3e188 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,8 +8,8 @@ kotlin-maven-example 1.0-SNAPSHOT - 1.4.32 - 1.4.32 + 1.6.0 + 1.6.0