aboutsummaryrefslogtreecommitdiff
path: root/docs/src/doc
diff options
context:
space:
mode:
authorIgnat Beresnev <ignat.beresnev@jetbrains.com>2022-04-15 12:45:15 +0300
committerGitHub <noreply@github.com>2022-04-15 12:45:15 +0300
commit48b5918c2d465b482de4f070879b5ad93cc248b3 (patch)
tree4921a58ea50e323b81dadf180a91e51be0f50946 /docs/src/doc
parent334c9e14dff14f0eb08bda10bac9e622aa132afc (diff)
downloaddokka-48b5918c2d465b482de4f070879b5ad93cc248b3.tar.gz
dokka-48b5918c2d465b482de4f070879b5ad93cc248b3.tar.bz2
dokka-48b5918c2d465b482de4f070879b5ad93cc248b3.zip
Update documentation, examples and test references to 1.6.20 (#2440)
* Update documentation/example/test references to 1.6.20 * Mute Multiplatform0GradleIntegrationTest due to missing KLIB support * Update gradle and AGP versions to the latest
Diffstat (limited to 'docs/src/doc')
-rw-r--r--docs/src/doc/docs/community/plugins-list.md8
-rw-r--r--docs/src/doc/docs/user_guide/base-specific/frontend.md2
-rw-r--r--docs/src/doc/docs/user_guide/cli/usage.md12
-rw-r--r--docs/src/doc/docs/user_guide/gradle/usage.md8
4 files changed, 15 insertions, 15 deletions
diff --git a/docs/src/doc/docs/community/plugins-list.md b/docs/src/doc/docs/community/plugins-list.md
index 048a8cab..a3d604e6 100644
--- a/docs/src/doc/docs/community/plugins-list.md
+++ b/docs/src/doc/docs/community/plugins-list.md
@@ -9,10 +9,10 @@ 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.6.10/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.10/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.10/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.10/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.20/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.20/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.20/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.20/user_guide/introduction/#plugins) | Renders documentation in a Jekyll format | [Github](https://github.com/Kotlin/dokka/tree/master/plugins/jekyll)
| [Mermaid-HTML](https://mermaid-js.github.io/mermaid/#/) | Renders Mermaid graphs for HTML renderer. | [Github](https://github.com/glureau/dokka-mermaid)
diff --git a/docs/src/doc/docs/user_guide/base-specific/frontend.md b/docs/src/doc/docs/user_guide/base-specific/frontend.md
index f2dd31b0..2a6deac9 100644
--- a/docs/src/doc/docs/user_guide/base-specific/frontend.md
+++ b/docs/src/doc/docs/user_guide/base-specific/frontend.md
@@ -92,7 +92,7 @@ Variables given below are available to the template:
Also, Dokka-defined [directives](https://freemarker.apache.org/docs/ref_directive_userDefined.html) can be used:
* `<@content/>` - main content
* `<@resources/>` - scripts, stylesheets
- * `<@version/>` - version ([versioning-plugin](https://kotlin.github.io/dokka/1.6.10/user_guide/versioning/versioning/) will replace this with a version navigator)
+ * `<@version/>` - version ([versioning-plugin](https://kotlin.github.io/dokka/1.6.20/user_guide/versioning/versioning/) will replace this with a version navigator)
* `<@template_cmd name="...""> ...</@template_cmd>` - is used for variables that depend on the root project (such `pathToRoot`, `projectName`). They are available only inside the directive. This is processed by a multi-module task that assembles partial outputs from modules.
Example:
```
diff --git a/docs/src/doc/docs/user_guide/cli/usage.md b/docs/src/doc/docs/user_guide/cli/usage.md
index 9f09c894..f3c816b8 100644
--- a/docs/src/doc/docs/user_guide/cli/usage.md
+++ b/docs/src/doc/docs/user_guide/cli/usage.md
@@ -93,8 +93,8 @@ The content of JSON file ```dokkaConfiguration.json```:
"sourceSetName": "main"
},
"classpath": [
- "libs/kotlin-stdlib-1.6.10.jar",
- "libs/kotlin-stdlib-common-1.6.10.jar"
+ "libs/kotlin-stdlib-1.6.20.jar",
+ "libs/kotlin-stdlib-common-1.6.20.jar"
],
"sourceRoots": [
"/home/Vadim.Mishenev/dokka/examples/cli/src/main/kotlin"
@@ -135,11 +135,11 @@ The content of JSON file ```dokkaConfiguration.json```:
}
],
"pluginsClasspath": [
- "plugins/dokka-base-1.6.10.jar",
+ "plugins/dokka-base-1.6.20.jar",
"libs/kotlinx-html-jvm-0.7.3.jar",
- "libs/dokka-analysis-1.6.10.jar",
- "libs/kotlin-analysis-intellij-1.6.10.jar",
- "libs/kotlin-analysis-compiler-1.6.10.jar"
+ "libs/dokka-analysis-1.6.20.jar",
+ "libs/kotlin-analysis-intellij-1.6.20.jar",
+ "libs/kotlin-analysis-compiler-1.6.20.jar"
],
"pluginsConfiguration": [
{
diff --git a/docs/src/doc/docs/user_guide/gradle/usage.md b/docs/src/doc/docs/user_guide/gradle/usage.md
index 18ef1783..982923fc 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.6.10"
+ id("org.jetbrains.dokka") version "1.6.20"
}
repositories {
@@ -269,7 +269,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.6.10")
+ dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
}
```
@@ -278,7 +278,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.6.10")
+ plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
}
}
```
@@ -311,7 +311,7 @@ For example, you can add `DokkaBase` to gain access to aforementioned configurat
buildscript {
dependencies {
// classpath("<plugin coordinates>:<plugin version>")
- classpath("org.jetbrains.dokka:dokka-base:1.6.10")
+ classpath("org.jetbrains.dokka:dokka-base:1.6.20")
}
}
```