diff options
author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2022-07-08 15:06:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-08 15:06:57 +0200 |
commit | 9fbe33bdc656cea5b199771b0df116b8786c9b95 (patch) | |
tree | 8374fa63edd1627a71686ac5968c3e5b03760824 /integration-tests | |
parent | 3332f9f95be5cdea153818ae5d965298aa8c82f9 (diff) | |
download | dokka-9fbe33bdc656cea5b199771b0df116b8786c9b95.tar.gz dokka-9fbe33bdc656cea5b199771b0df116b8786c9b95.tar.bz2 dokka-9fbe33bdc656cea5b199771b0df116b8786c9b95.zip |
Update Kotlin to 1.7.10 (#2564)
Diffstat (limited to 'integration-tests')
11 files changed, 14 insertions, 14 deletions
diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties index 747d6449..3e9a5b51 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.0 +dokka_it_kotlin_version=1.7.10 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 808b10d4..80612345 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.0 +dokka_it_kotlin_version=1.7.10 diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties index 808b10d4..80612345 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.0 +dokka_it_kotlin_version=1.7.10 diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties index 808b10d4..80612345 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.0 +dokka_it_kotlin_version=1.7.10 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 23fd5af1..48aa5d9e 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.0 +dokka_it_kotlin_version=1.7.10 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 808b10d4..80612345 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.0 +dokka_it_kotlin_version=1.7.10 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index 808b10d4..80612345 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.0 +dokka_it_kotlin_version=1.7.10 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 6c5ca523..e94932a7 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.0 +dokka_it_kotlin_version=1.7.10 diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index 808b10d4..80612345 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.7.0 +dokka_it_kotlin_version=1.7.10 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 afa60312..0694cdd1 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.0", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.10", "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.0", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.10", "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.0", "1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.10", "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 "-Preact_version=17.0.2-pre.280-kotlin-1.6.0", "1.5.31" to "-Preact_version=17.0.2-pre.265-kotlin-1.5.31", "1.6.21" to "-Preact_version=18.0.0-pre.332-kotlin-1.6.21", - "1.7.0" to "-Preact_version=18.1.0-pre.345" + "1.7.10" to "-Preact_version=18.2.0-pre.351" // TODO update to confirmed 1.7.10 ) } diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml index 379aa800..823933ca 100644 --- 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.0</kotlin.version> + <kotlin.version>1.7.10</kotlin.version> </properties> <build> <plugins> |