Skip to content

Commit

Permalink
Update Kotlin to 1.7.20 (#2692)
Browse files Browse the repository at this point in the history
(cherry picked from commit 40da670)
  • Loading branch information
IgnatBeresnev committed Oct 4, 2022
1 parent b923bb6 commit 1e67fe7
Show file tree
Hide file tree
Showing 23 changed files with 26 additions and 26 deletions.
@@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion examples/gradle/dokka-gradle-example/build.gradle.kts
Expand Up @@ -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")
}

Expand Down
@@ -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")
}

Expand Down
@@ -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`
Expand Down
@@ -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")
}
}
Expand Down
Expand Up @@ -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"
}

Expand Down
@@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion examples/maven/pom.xml
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/hide-internal-api/build.gradle.kts
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Expand Up @@ -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
Expand Down
@@ -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
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
Expand Up @@ -16,7 +16,7 @@ buildscript {
}
}

version = "1.7.10-SNAPSHOT"
version = "1.7.20-SNAPSHOT"

apply(from = "../template.root.gradle.kts")

Expand Down
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
@@ -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
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20

@@ -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
Expand Down
Expand Up @@ -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"
)

Expand Down
Expand Up @@ -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"))
Expand All @@ -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"))
)

Expand All @@ -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",
)
}
2 changes: 1 addition & 1 deletion integration-tests/maven/projects/it-maven/pom.xml
Expand Up @@ -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>
Expand Down

0 comments on commit 1e67fe7

Please sign in to comment.