aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Mishenev <vad-mishenev@yandex.ru>2023-09-04 16:49:30 +0300
committerGitHub <noreply@github.com>2023-09-04 16:49:30 +0300
commit8065a0d974420898fe6142fa792d6dab50f8b1d5 (patch)
tree472d3b166f8beac5525ebdc0c4afcb8c1f307785
parent61619d5b794616678934d4de89fb08857c293225 (diff)
downloaddokka-8065a0d974420898fe6142fa792d6dab50f8b1d5.tar.gz
dokka-8065a0d974420898fe6142fa792d6dab50f8b1d5.tar.bz2
dokka-8065a0d974420898fe6142fa792d6dab50f8b1d5.zip
Update Kotlin to 1.9.10 (#3158)
-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/gradle.properties2
-rw-r--r--integration-tests/gradle/projects/it-collector-0/gradle.properties2
-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/TestedVersions.kt7
-rw-r--r--integration-tests/maven/projects/it-maven/pom.xml2
15 files changed, 19 insertions, 18 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7b650cf5..05a1faf2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
[versions]
-gradlePlugin-kotlin = "1.9.0"
+gradlePlugin-kotlin = "1.9.10"
# See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin
gradlePlugin-android = "4.2.2"
gradlePlugin-dokka = "1.9.0"
@@ -10,7 +10,7 @@ kotlinx-collections-immutable = "0.3.4"
kotlinx-bcv = "0.12.1"
## Analysis
-kotlin-compiler = "1.9.0"
+kotlin-compiler = "1.9.10"
kotlin-compiler-k2 = "1.9.0-release-358"
# 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 d2925eda..6f34e9b0 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.0
+dokka_it_kotlin_version=1.9.10
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 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties
index 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties
index 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
diff --git a/integration-tests/gradle/projects/it-configuration/gradle.properties b/integration-tests/gradle/projects/it-configuration/gradle.properties
index 1df93d9d..36aa0558 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.0
+dokka_it_kotlin_version=1.9.10
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 207f1c1b..63c36fae 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.0
+dokka_it_kotlin_version=1.9.10
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 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties
index 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
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 59f7caac..504f59b0 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.0
+dokka_it_kotlin_version=1.9.10
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
index 675b0eda..4d8f2847 100644
--- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
+++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
@@ -2,7 +2,7 @@
# 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.0
+dokka_it_kotlin_version=1.9.10
#these flags are enabled by default since 1.6.20.
#remove when this test is executed with Kotlin >= 1.6.20
kotlin.mpp.enableGranularSourceSetsMetadata=true
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 fd784606..713c80d6 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.0
+dokka_it_kotlin_version=1.9.10
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 5aca2924..1e2686ef 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.0
+dokka_it_kotlin_version=1.9.10
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 e92f93e1..3493879a 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.0")
+ val LATEST = BuildVersions("7.6.2", "1.9.10")
/**
* All supported Gradle/Kotlin versions, including [LATEST]
@@ -23,8 +23,8 @@ internal object TestedVersions {
*/
val ALL_SUPPORTED =
BuildVersions.permutations(
- gradleVersions = listOf("6.9"),
- kotlinVersions = listOf("1.8.20", "1.7.20", "1.6.21", "1.5.31"),
+ gradleVersions = listOf("7.6.2"),
+ kotlinVersions = listOf("1.9.0", "1.8.20", "1.7.20", "1.6.21", "1.5.31"),
) + BuildVersions.permutations(
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
kotlinVersions = listOf(*ifExhaustive( "1.8.0", "1.7.0", "1.6.0", "1.5.0"))
@@ -60,6 +60,7 @@ internal object TestedVersions {
"1.8.10" to "18.2.0-pre.490",
"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",
)
}
diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml
index 3d1d5f78..c426fb36 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.0</kotlin.version>
+ <kotlin.version>1.9.10</kotlin.version>
</properties>
<build>
<plugins>