aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Mishenev <vad-mishenev@yandex.ru>2023-11-06 14:31:22 +0200
committerGitHub <noreply@github.com>2023-11-06 14:31:22 +0200
commit84e48b516500433332e9279237cd139f7836ca94 (patch)
tree8aa04ea7392bd73331dc3582ffafddb37ebffb31
parent2b0a63f3565f620f7212a822aee2575a46f44897 (diff)
downloaddokka-84e48b516500433332e9279237cd139f7836ca94.tar.gz
dokka-84e48b516500433332e9279237cd139f7836ca94.tar.bz2
dokka-84e48b516500433332e9279237cd139f7836ca94.zip
Update Kotlin to 1.9.20 (#3319)
* Update compiler and KGP to 1.9.20 * Update integration tests
-rw-r--r--gradle/libs.versions.toml4
-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-configuration/build.gradle.kts2
-rw-r--r--integration-tests/gradle/projects/it-configuration/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-js-ir-0/gradle.properties2
-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/projects/it-sequential-tasks-execution-stress/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-wasm-basic/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/TestedVersions.kt4
-rw-r--r--integration-tests/maven/projects/it-maven/pom.xml2
18 files changed, 20 insertions, 20 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 034c09cb..ac9c0440 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
[versions]
-gradlePlugin-kotlin = "1.9.20-RC2"
+gradlePlugin-kotlin = "1.9.20"
# See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
gradlePlugin-android = "4.2.2"
gradlePlugin-dokka = "1.9.10"
@@ -10,7 +10,7 @@ kotlinx-collections-immutable = "0.3.6"
kotlinx-bcv = "0.13.2"
## Analysis
-kotlin-compiler = "1.9.20-RC2"
+kotlin-compiler = "1.9.20"
kotlin-compiler-k2 = "2.0.0-dev-5387"
# MUST match the version of the intellij platform used in the kotlin compiler,
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties
index 6f34e9b0..286fe3c3 100644
--- a/integration-tests/gradle/projects/it-android-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-android-0/gradle.properties
@@ -2,6 +2,6 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
dokka_it_android_gradle_plugin_version=4.2.2
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 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 5cb354f4..c30e0402 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -20,7 +20,7 @@ buildscript {
}
}
-version = "1.9.10-SNAPSHOT"
+version = "1.9.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 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-basic/gradle.properties
+++ b/integration-tests/gradle/projects/it-basic/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties
index 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-collector-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-configuration/build.gradle.kts b/integration-tests/gradle/projects/it-configuration/build.gradle.kts
index 76e3f651..736202bb 100644
--- a/integration-tests/gradle/projects/it-configuration/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-configuration/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
}
}
-version = "1.9.10-SNAPSHOT"
+version = "1.9.20-SNAPSHOT"
apply(from = "../template.root.gradle.kts")
diff --git a/integration-tests/gradle/projects/it-configuration/gradle.properties b/integration-tests/gradle/projects/it-configuration/gradle.properties
index 36aa0558..f958d9e3 100644
--- a/integration-tests/gradle/projects/it-configuration/gradle.properties
+++ b/integration-tests/gradle/projects/it-configuration/gradle.properties
@@ -2,6 +2,6 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
fail_on_warning=false
report_undocumented=false
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 63c36fae..a7b64215 100644
--- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties
@@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
react_version=18.2.0-pre.467
diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
index 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
index 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.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 504f59b0..a8c59753 100644
--- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
@@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
index 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
diff --git a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties
index 713c80d6..c49881b9 100644
--- a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties
+++ b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties
@@ -2,5 +2,5 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.20
task_number=100
diff --git a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties
index 1e2686ef..5904fc21 100644
--- a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties
+++ b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties
@@ -2,4 +2,4 @@
# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#
-dokka_it_kotlin_version=1.9.10
+dokka_it_kotlin_version=1.9.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 a23fb410..f2c1de0e 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
@@ -158,7 +158,7 @@ class BasicGradleIntegrationTest : AbstractGradleIntegrationTest() {
val indexFile = File(this, "index.html")
assertTrue(indexFile.isFile, "Missing index.html")
assertTrue(
- """<title>Basic Project 1.9.10-SNAPSHOT API </title>""" in indexFile.readText(),
+ """<title>Basic Project 1.9.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/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt
index e4634c09..7c3ea4df 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
@@ -14,7 +14,7 @@ internal open class AllSupportedTestedVersionsArgumentsProvider : TestedVersions
internal object TestedVersions {
- val LATEST = BuildVersions("7.6.2", "1.9.20-RC2")
+ val LATEST = BuildVersions("7.6.2", "1.9.20")
/**
* All supported Gradle/Kotlin versions, including [LATEST]
@@ -61,7 +61,7 @@ internal object TestedVersions {
"1.8.20" to "18.2.0-pre.546",
"1.9.0" to "18.2.0-pre.597",
"1.9.10" to "18.2.0-pre.597",
- "1.9.20-RC2" to "18.2.0-pre.635",
+ "1.9.20" to "18.2.0-pre.635",
)
}
diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml
index 3e20bf53..6246e27a 100644
--- a/integration-tests/maven/projects/it-maven/pom.xml
+++ b/integration-tests/maven/projects/it-maven/pom.xml
@@ -11,7 +11,7 @@
<version>1.0-SNAPSHOT</version>
<properties>
- <kotlin.version>1.9.20-RC</kotlin.version>
+ <kotlin.version>1.9.20</kotlin.version>
</properties>
<build>
<plugins>