diff --git a/dokka-integration-tests/gradle/projects/it-android-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-android-0/gradle.properties index d5120ef0b9..18cc5f05aa 100644 --- a/dokka-integration-tests/gradle/projects/it-android-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-android-0/gradle.properties @@ -2,6 +2,6 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 -dokka_it_android_gradle_plugin_version=4.2.2 +dokka_it_kotlin_version=2.0.0 +dokka_it_android_gradle_plugin_version=4.2.0.02.2 android.useAndroidX=true diff --git a/dokka-integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/dokka-integration-tests/gradle/projects/it-basic-groovy/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-basic-groovy/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-basic/gradle.properties b/dokka-integration-tests/gradle/projects/it-basic/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-basic/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-basic/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-collector-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-collector-0/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-collector-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-collector-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-configuration/gradle.properties b/dokka-integration-tests/gradle/projects/it-configuration/gradle.properties index 3670df814d..e36bf99f91 100644 --- a/dokka-integration-tests/gradle/projects/it-configuration/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-configuration/gradle.properties @@ -2,6 +2,6 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 fail_on_warning=false report_undocumented=false diff --git a/dokka-integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-js-ir-0/gradle.properties index e365991692..20d3a22e7b 100644 --- a/dokka-integration-tests/gradle/projects/it-js-ir-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-js-ir-0/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 react_version=18.2.0-pre.467 diff --git a/dokka-integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-multimodule-0/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-multimodule-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-multimodule-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/dokka-integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-multimodule-inter-module-links/gradle.properties b/dokka-integration-tests/gradle/projects/it-multimodule-inter-module-links/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-multimodule-inter-module-links/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-multimodule-inter-module-links/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties index 09ed4517e3..98987cbc03 100644 --- a/dokka-integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/dokka-integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties b/dokka-integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties index a9c60dd151..e2deb08a07 100644 --- a/dokka-integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties @@ -2,5 +2,5 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 task_number=100 diff --git a/dokka-integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle.properties b/dokka-integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle.properties index 3da8c6411a..3670c3cfe6 100644 --- a/dokka-integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle.properties +++ b/dokka-integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle.properties @@ -2,4 +2,4 @@ # Copyright 2014-2024 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -dokka_it_kotlin_version=2.0.0-RC3 +dokka_it_kotlin_version=2.0.0 diff --git a/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index 6030d223cc..b3fd6d7d45 100644 --- a/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -14,7 +14,7 @@ open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArguments object TestedVersions { - val LATEST = BuildVersions("8.7", "2.0.0-RC3") + val LATEST = BuildVersions("8.7", "2.0.0") /** * All supported Gradle/Kotlin versions, including [LATEST] @@ -41,7 +41,7 @@ object TestedVersions { val ANDROID = BuildVersions.permutations( gradleVersions = listOf("8.4"), - kotlinVersions = listOf("2.0.0-RC3"), + kotlinVersions = listOf("2.0.0"), androidGradlePluginVersions = listOf("8.3.0") ) + BuildVersions.permutations( gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")), @@ -66,7 +66,7 @@ object TestedVersions { "1.9.0" to "18.2.0-pre.597", "1.9.10" to "18.2.0-pre.597", "1.9.23" to "18.2.0-pre.682", - "2.0.0-RC3" to "18.2.0-pre.726", + "2.0.0" to "18.2.0-pre.726", ) } diff --git a/dokka-integration-tests/maven/projects/it-maven/pom.xml b/dokka-integration-tests/maven/projects/it-maven/pom.xml index bc7eba2ce9..1d7663fc2d 100644 --- a/dokka-integration-tests/maven/projects/it-maven/pom.xml +++ b/dokka-integration-tests/maven/projects/it-maven/pom.xml @@ -11,7 +11,7 @@ 1.0-SNAPSHOT - 2.0.0-RC3 + 2.0.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d233d3592..9d0dfd7665 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -gradlePlugin-kotlin = "2.0.0-RC3" +gradlePlugin-kotlin = "2.0.0" # See: https://kotlinlang.org/docs/gradle-configure-project.html#apply-the-plugin gradlePlugin-android = "7.1.3" gradlePlugin-dokka = "1.9.20" @@ -11,7 +11,7 @@ kotlinx-serialization = "1.6.0" kotlinx-bcv = "0.13.2" ## Analysis -kotlin-compiler = "2.0.0-RC3" +kotlin-compiler = "2.0.0" kotlin-compiler-k2 = "2.0.20-dev-3206" # MUST match the version of the intellij platform used in the kotlin compiler,