Update Kotlin to 1.7.20 (#2692)

IgnatBeresnev · IgnatBeresnev · commit 1e67fe74c2c8 · 2022-10-04T15:55:07.000+02:00
(cherry picked from commit 40da670)
diff --git a/examples/gradle/dokka-customFormat-example/build.gradle.kts b/examples/gradle/dokka-customFormat-example/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version ("1.7.10")
 }
 
diff --git a/examples/gradle/dokka-gradle-example/build.gradle.kts b/examples/gradle/dokka-gradle-example/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import java.net.URL
 
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version ("1.7.10")
 }
 
diff --git a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version ("1.7.10")
 }
 
diff --git a/examples/gradle/dokka-library-publishing-example/build.gradle.kts b/examples/gradle/dokka-library-publishing-example/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version ("1.7.10")
     `java-library`
     `maven-publish`
diff --git a/examples/gradle/dokka-multimodule-example/settings.gradle.kts b/examples/gradle/dokka-multimodule-example/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        kotlin("jvm") version "1.7.20-RC"
+        kotlin("jvm") version "1.7.20"
         id("org.jetbrains.dokka") version ("1.7.10")
     }
 }
diff --git a/examples/gradle/dokka-multiplatform-example/build.gradle.kts b/examples/gradle/dokka-multiplatform-example/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.Platform
 
 plugins {
-    kotlin("multiplatform") version "1.7.20-RC"
+    kotlin("multiplatform") version "1.7.20"
     id("org.jetbrains.dokka") version "1.7.10"
 }
 
diff --git a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version ("1.7.10") apply false
 }
 
diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>kotlin-maven-example</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <kotlin.version>1.7.20-RC</kotlin.version>
+        <kotlin.version>1.7.20</kotlin.version>
         <dokka.version>1.7.10</dokka.version>
     </properties>
 
diff --git a/examples/plugin/hide-internal-api/build.gradle.kts b/examples/plugin/hide-internal-api/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URI
 
 plugins {
-    kotlin("jvm") version "1.7.20-RC"
+    kotlin("jvm") version "1.7.20"
     id("org.jetbrains.dokka") version "1.7.10"
     `maven-publish`
     signing
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 dokka_version=1.7.20-SNAPSHOT
 dokka_integration_test_parallelism=2
 # Versions
-kotlin_version=1.7.20-RC
+kotlin_version=1.7.20
 coroutines_version=1.6.3
 kotlinx_html_version=0.7.5
 kotlin_plugin_version=213-1.7.20-199-IJ6777.52
diff --git 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.7.20-RC
+dokka_it_kotlin_version=1.7.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
@@ -1 +1 @@
-dokka_it_kotlin_version=1.7.20-RC
+dokka_it_kotlin_version=1.7.20
diff --git 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.7.10-SNAPSHOT"
+version = "1.7.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
@@ -1 +1 @@
-dokka_it_kotlin_version=1.7.20-RC
+dokka_it_kotlin_version=1.7.20
diff --git 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.7.20-RC
+dokka_it_kotlin_version=1.7.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
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.7.20-RC
+dokka_it_kotlin_version=1.7.20
 react_version=18.1.0-pre.345
diff --git 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.7.20-RC
+dokka_it_kotlin_version=1.7.20
diff --git 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.7.20-RC
+dokka_it_kotlin_version=1.7.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
@@ -1,2 +1,2 @@
-dokka_it_kotlin_version=1.7.20-RC
+dokka_it_kotlin_version=1.7.20
 
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
@@ -1,4 +1,4 @@
-dokka_it_kotlin_version=1.7.20-RC
+dokka_it_kotlin_version=1.7.20
 #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/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.7.10-SNAPSHOT API </title>""" in indexFile.readText(),
+            """<title>Basic Project 1.7.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
@@ -5,7 +5,7 @@ internal object TestedVersions {
     val BASE =
         BuildVersions.permutations(
             gradleVersions = listOf("7.4.2", "6.9"),
-            kotlinVersions = listOf("1.7.20-RC", "1.6.21", "1.5.31", "1.4.32"),
+            kotlinVersions = listOf("1.7.20", "1.6.21", "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"))
@@ -18,11 +18,11 @@ internal object TestedVersions {
     val ANDROID =
         BuildVersions.permutations(
             gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
-            kotlinVersions = listOf("1.7.20-RC", "1.6.21", "1.5.31", "1.4.32"),
+            kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"),
             androidGradlePluginVersions = listOf("7.2.0")
         ) + BuildVersions.permutations(
             gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")),
-            kotlinVersions = listOf("1.7.20-RC", "1.6.21", "1.5.31", "1.4.32"),
+            kotlinVersions = listOf("1.7.20", "1.6.21", "1.5.31", "1.4.32"),
             androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3"))
         )
 
@@ -32,6 +32,6 @@ internal object TestedVersions {
         "1.6.0" to "17.0.2-pre.280-kotlin-1.6.0",
         "1.5.31" to "17.0.2-pre.265-kotlin-1.5.31",
         "1.6.21" to "18.0.0-pre.332-kotlin-1.6.21",
-        "1.7.20-RC" to "18.2.0-pre.391",
+        "1.7.20" to "18.2.0-pre.391",
     )
 }
diff --git 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.7.20-RC</kotlin.version>
+        <kotlin.version>1.7.20</kotlin.version>
     </properties>
     <build>
         <plugins>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import org.jetbrains.dokka.gradle.DokkaTask`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("jvm") version "1.7.20-RC"`
	`4`	`+ kotlin("jvm") version "1.7.20"`
`5`	`5`	`id("org.jetbrains.dokka") version ("1.7.10")`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask`
`2`	`2`	`import java.net.URL`
`3`	`3`
`4`	`4`	`plugins {`
`5`		`- kotlin("jvm") version "1.7.20-RC"`
	`5`	`+ kotlin("jvm") version "1.7.20"`
`6`	`6`	`id("org.jetbrains.dokka") version ("1.7.10")`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- kotlin("jvm") version "1.7.20-RC"`
	`2`	`+ kotlin("jvm") version "1.7.20"`
`3`	`3`	`id("org.jetbrains.dokka") version ("1.7.10")`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`pluginManagement {`
`2`	`2`	`plugins {`
`3`		`- kotlin("jvm") version "1.7.20-RC"`
	`3`	`+ kotlin("jvm") version "1.7.20"`
`4`	`4`	`id("org.jetbrains.dokka") version ("1.7.10")`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask`
`4`	`4`	`import org.jetbrains.dokka.Platform`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- kotlin("multiplatform") version "1.7.20-RC"`
	`7`	`+ kotlin("multiplatform") version "1.7.20"`
`8`	`8`	`id("org.jetbrains.dokka") version "1.7.10"`
`9`	`9`	`}`
`10`	`10`