diff options
author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2022-10-04 15:32:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-04 15:32:18 +0200 |
commit | 40da670a830a92e9b06267b80bfa89a7f444a479 (patch) | |
tree | 60bfd153ead239dabc2c926254431ea03c3f16e9 /integration-tests/gradle | |
parent | bf8e7dc36360bb122599de2f175e5d010eb0cf10 (diff) | |
download | dokka-40da670a830a92e9b06267b80bfa89a7f444a479.tar.gz dokka-40da670a830a92e9b06267b80bfa89a7f444a479.tar.bz2 dokka-40da670a830a92e9b06267b80bfa89a7f444a479.zip |
Update Kotlin to 1.7.20 (#2692)
Diffstat (limited to 'integration-tests/gradle')
12 files changed, 15 insertions, 15 deletions
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties index 0610fb62..6c0d7406 100644 --- 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 index 9af31a1c..fa6c65f6 100644 --- 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 index ad4d48ad..b1484ac9 100644 --- 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 index 9af31a1c..fa6c65f6 100644 --- 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 index 9af31a1c..fa6c65f6 100644 --- 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 index bd992717..6df9a408 100644 --- 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 index 9af31a1c..fa6c65f6 100644 --- 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 index 9af31a1c..fa6c65f6 100644 --- 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 index d9956c89..731bcb72 100644 --- 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 index 3cd9e773..9d87e55a 100644 --- 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 index 2c063d1e..2e48447a 100644 --- 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 index 18ebe427..b6f2abd3 100644 --- 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", ) } |