Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kotlin to 1.7.20 #2692

Merged
merged 1 commit into from Oct 4, 2022
Merged

Update Kotlin to 1.7.20 #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/gradle/dokka-customFormat-example/build.gradle.kts
View file
Open in desktop
@@ -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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion examples/gradle/dokka-library-publishing-example/build.gradle.kts
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion examples/gradle/dokka-multimodule-example/settings.gradle.kts
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion examples/gradle/dokka-multiplatform-example/build.gradle.kts
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts
View file
Open in desktop
@@ -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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
dokka_version=1.8.0-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
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-android-0/gradle.properties
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-basic-groovy/gradle.properties
View file
Open in desktop
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-basic/build.gradle.kts
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-basic/gradle.properties
View file
Open in desktop
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-collector-0/gradle.properties
View file
Open in desktop
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-js-ir-0/gradle.properties
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-multimodule-0/gradle.properties
View file
Open in desktop
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-multimodule-1/gradle.properties
View file
Open in desktop
@@ -1 +1 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20
2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties
View file
Open in desktop
@@ -1,2 +1,2 @@
dokka_it_kotlin_version=1.7.20-RC
dokka_it_kotlin_version=1.7.20

2 changes: 1 addition & 1 deletion integration-tests/gradle/projects/it-multiplatform-0/gradle.properties
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion ...le/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...n-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt
View file
Open in desktop
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
View file
Open in desktop
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