aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--README.md8
-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
-rw-r--r--examples/gradle/dokka-customFormat-example/build.gradle.kts6
-rw-r--r--examples/gradle/dokka-gradle-example/build.gradle.kts4
-rw-r--r--examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts10
-rw-r--r--examples/gradle/dokka-library-publishing-example/build.gradle.kts4
-rw-r--r--examples/gradle/dokka-multimodule-example/settings.gradle.kts4
-rw-r--r--examples/gradle/dokka-multiplatform-example/build.gradle.kts4
-rw-r--r--examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts6
-rw-r--r--examples/gradle/dokka-versioning-multimodule-example/parentProject/build.gradle.kts4
-rw-r--r--examples/maven/pom.xml4
-rw-r--r--integration-tests/gradle/projects/it-android-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-basic-groovy/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-basic/build.gradle.kts2
-rw-r--r--integration-tests/gradle/projects/it-basic/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-collector-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-js-ir-0/gradle.properties4
-rw-r--r--integration-tests/gradle/projects/it-multimodule-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multimodule-1/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-multiplatform-0/gradle.properties2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt1
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt13
-rw-r--r--integration-tests/maven/projects/it-maven/pom.xml2
29 files changed, 65 insertions, 63 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34073a28..ac48e6e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,13 +29,13 @@ Here's how to import and configure Dokka in IntelliJ IDEA:
If you want to use/test your locally built Dokka in a project, do the following:
1. Change `dokka_version` in `gradle.properties` to something that you will use later on as the dependency version.
- For instance, you can set it to something like `1.6.10-my-fix-SNAPSHOT`.
+ For instance, you can set it to something like `1.6.20-my-fix-SNAPSHOT`.
2. Publish it to maven local (`./gradlew publishToMavenLocal`)
3. In the project you want to generate documentation for, add maven local as a plugin/dependency
repository (`mavenLocal()`)
4. Update your dokka dependency to the version you've just published:
```kotlin
plugins {
- id("org.jetbrains.dokka") version "1.6.10-my-fix-SNAPSHOT"
+ id("org.jetbrains.dokka") version "1.6.20-my-fix-SNAPSHOT"
}
```
diff --git a/README.md b/README.md
index eaaee150..4fa4d986 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.6.10/](https://kotlin.github.io/dokka/1.6.10/)**
+**Full documentation is available at [https://kotlin.github.io/dokka/1.6.20/](https://kotlin.github.io/dokka/1.6.20/)**
### 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.6.10"
+ id("org.jetbrains.dokka") version "1.6.20"
}
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.6.10")
+ dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
}
```
@@ -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.6.10")
+ plugins("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
}
}
```
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")
}
}
```
diff --git a/examples/gradle/dokka-customFormat-example/build.gradle.kts b/examples/gradle/dokka-customFormat-example/build.gradle.kts
index 179f0394..59760f50 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.10"
- id("org.jetbrains.dokka") version ("1.6.10")
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20")
}
buildscript {
dependencies {
- classpath("org.jetbrains.dokka:dokka-base:1.6.10")
+ classpath("org.jetbrains.dokka:dokka-base:1.6.20")
}
}
diff --git a/examples/gradle/dokka-gradle-example/build.gradle.kts b/examples/gradle/dokka-gradle-example/build.gradle.kts
index fb1127e5..0bccbe3a 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.10"
- id("org.jetbrains.dokka") version ("1.6.10")
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20")
}
repositories {
diff --git a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts
index 7dc5abc8..27096f58 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.10"
- id("org.jetbrains.dokka") version ("1.6.10")
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20")
}
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.10")
+ dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
// Will apply the plugin only to the `:dokkaHtml` task
- //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.10")
+ //dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
// Will apply the plugin only to the `:dokkaGfm` task
- //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.10")
+ //dokkaGfmPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.20")
}
diff --git a/examples/gradle/dokka-library-publishing-example/build.gradle.kts b/examples/gradle/dokka-library-publishing-example/build.gradle.kts
index cf1f5086..6882eda4 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.10"
- id("org.jetbrains.dokka") version ("1.6.10")
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20")
`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 be28811b..c1afe758 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.10"
- id("org.jetbrains.dokka") version ("1.6.10")
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20")
}
}
diff --git a/examples/gradle/dokka-multiplatform-example/build.gradle.kts b/examples/gradle/dokka-multiplatform-example/build.gradle.kts
index 996eaf94..e3b55875 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.10"
- id("org.jetbrains.dokka") version "1.6.10"
+ kotlin("multiplatform") version "1.6.20"
+ id("org.jetbrains.dokka") version "1.6.20"
}
repositories {
diff --git a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts
index 3744f757..d4627ab8 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.10"
- id("org.jetbrains.dokka") version ("1.6.10") apply false
+ kotlin("jvm") version "1.6.20"
+ id("org.jetbrains.dokka") version ("1.6.20") 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.10")
+ dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.6.20")
}
}
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 1093e3e8..26145325 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<DokkaMultiModuleTask>("dokkaPreviouslyDocumentation") {
dependencies {
- dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:1.6.10")
- dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.6.10")
+ dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:1.6.20")
+ dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.6.20")
}
val configuredVersion = "0.9"
outputDirectory.set(file(projectDir.toPath().resolve(olderVersionsFolder).resolve(configuredVersion)))
diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml
index 13247f1f..8e6c4ca2 100644
--- a/examples/maven/pom.xml
+++ b/examples/maven/pom.xml
@@ -8,8 +8,8 @@
<artifactId>kotlin-maven-example</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
- <kotlin.version>1.6.10</kotlin.version>
- <dokka.version>1.6.10</dokka.version>
+ <kotlin.version>1.6.20</kotlin.version>
+ <dokka.version>1.6.20</dokka.version>
</properties>
<dependencies>
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties
index f368eb83..c9328126 100644
--- a/integration-tests/gradle/projects/it-android-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-android-0/gradle.properties
@@ -1,3 +1,3 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
dokka_it_android_gradle_plugin_version=4.0.0
android.useAndroidX=true
diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index f4585a87..a25f2262 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
}
}
-version = "1.6.10-SNAPSHOT"
+version = "1.6.20-SNAPSHOT"
apply(from = "../template.root.gradle.kts")
diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-basic/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-collector-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
index 272e8f30..7c5ca4ee 100644
--- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.6.10
-react_version=18.0.0-pre.325-kotlin-1.6.10
+dokka_it_kotlin_version=1.6.20
+react_version=18.0.0-pre.329-kotlin-1.6.20
diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
index a4f2b91c..1b545223 100644
--- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
index 04177526..64b8ac75 100644
--- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
@@ -1 +1 @@
-dokka_it_kotlin_version=1.6.10
+dokka_it_kotlin_version=1.6.20
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
index 58383805..9a4d1ab9 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
@@ -156,7 +156,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
val indexFile = File(this, "index.html")
assertTrue(indexFile.isFile, "Missing index.html")
assertTrue(
- """<title>Basic Project 1.6.10-SNAPSHOT API </title>""" in indexFile.readText(),
+ """<title>Basic Project 1.6.20-SNAPSHOT API </title>""" in indexFile.readText(),
"Header with version number not present in index.html"
)
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt
index 55f4ce64..64064c93 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt
@@ -23,6 +23,7 @@ class Multiplatform0GradleIntegrationTest(override val versions: BuildVersions)
}
@Test
+ @Ignore("KLIB is currently not supported, planned for 1.6.21")
fun execute() {
val result = createGradleRunner("dokkaHtml", "-i", "-s").buildRelaxed()
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt
index 85f40cb7..4ed06b9f 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt
@@ -4,8 +4,8 @@ internal object TestedVersions {
val BASE =
BuildVersions.permutations(
- gradleVersions = listOf("7.3", "6.9"),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
+ gradleVersions = listOf("7.4.2", "6.9"),
+ kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"),
) + BuildVersions.permutations(
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0"))
@@ -17,12 +17,12 @@ internal object TestedVersions {
*/
val ANDROID =
BuildVersions.permutations(
- gradleVersions = listOf("7.3", *ifExhaustive("7.0")),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
- androidGradlePluginVersions = listOf("7.0.0")
+ gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
+ kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"),
+ androidGradlePluginVersions = listOf("7.1.2")
) + BuildVersions.permutations(
gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")),
- kotlinVersions = listOf("1.6.10", "1.5.31", "1.4.32"),
+ kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"),
androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3"))
)
@@ -32,5 +32,6 @@ internal object TestedVersions {
"1.6.0" to "-Preact_version=17.0.2-pre.280-kotlin-1.6.0",
"1.5.31" to "-Preact_version=17.0.2-pre.265-kotlin-1.5.31",
"1.6.10" to "-Preact_version=18.0.0-pre.325-kotlin-1.6.10",
+ "1.6.20" to "-Preact_version=18.0.0-pre.329-kotlin-1.6.20"
)
} \ No newline at end of file
diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml
index c6270d6a..f8087ce4 100644
--- a/integration-tests/maven/projects/it-maven/pom.xml
+++ b/integration-tests/maven/projects/it-maven/pom.xml
@@ -7,7 +7,7 @@
<version>1.0-SNAPSHOT</version>
<properties>
- <kotlin.version>1.6.10</kotlin.version>
+ <kotlin.version>1.6.20</kotlin.version>
</properties>
<build>
<plugins>