Update Kotlin to 2.0.0-RC3 (#3605)

Kotlin · May 13, 2024 · a4b4ba8 · a4b4ba8
1 parent c57a33c
commit a4b4ba8
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 22 deletions.
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
 dokka_it_android_gradle_plugin_version=4.2.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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
 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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
 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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
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
@@ -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=1.9.20
+dokka_it_kotlin_version=2.0.0-RC3
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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
 
diff --git 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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
 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
@@ -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-RC1
+dokka_it_kotlin_version=2.0.0-RC3
diff --git a/...-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/...-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-RC1")
+    val LATEST = BuildVersions("8.7", "2.0.0-RC3")
 
     /**
      * 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-RC1"),
+            kotlinVersions = listOf("2.0.0-RC3"),
             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-RC1" to "18.2.0-pre.726",
+        "2.0.0-RC3" 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
@@ -11,7 +11,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <kotlin.version>2.0.0-RC1</kotlin.version>
+        <kotlin.version>2.0.0-RC3</kotlin.version>
     </properties>
     <build>
         <plugins>

diff --git a/...lugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt b/...lugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt
@@ -6,14 +6,12 @@ package org.jetbrains.dokka.gradle.kotlin
 
 import org.gradle.api.Project
 import org.jetbrains.dokka.gradle.kotlin
-import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
 
-internal typealias KotlinCompilation =
-        org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<KotlinCommonOptions>
+internal typealias KotlinCompilation = org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<*>
 
 internal fun Project.compilationsOf(sourceSet: KotlinSourceSet): List<KotlinCompilation> {
     //KT-45412 Make sure .kotlinSourceSets and .allKotlinSourceSets include the default source set

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-gradlePlugin-kotlin = "2.0.0-RC1"
+gradlePlugin-kotlin = "2.0.0-RC3"
 # 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-RC1"
+kotlin-compiler = "2.0.0-RC3"
 kotlin-compiler-k2 = "2.0.20-dev-7"
 
 # MUST match the version of the intellij platform used in the kotlin compiler,