diff options
| author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2022-04-21 17:12:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 17:12:27 +0300 |
| commit | 14710abcbae17f835c98e42615c8fe5e946d3b4a (patch) | |
| tree | d3dd59962b58140795e57af8f5ac38984ffc2067 | |
| parent | cee2fce2484ca9759161ca216bb9cdc6d68f5d04 (diff) | |
| download | dokka-14710abcbae17f835c98e42615c8fe5e946d3b4a.tar.gz dokka-14710abcbae17f835c98e42615c8fe5e946d3b4a.tar.bz2 dokka-14710abcbae17f835c98e42615c8fe5e946d3b4a.zip | |
Update Kotlin to 1.6.21 (#2454)
* Update Kotlin to 1.6.21
* Use 1.6.20 react wrapper for 1.6.21 kotlin
| -rw-r--r-- | gradle.properties | 4 | ||||
| -rw-r--r-- | integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/gradle.properties b/gradle.properties index 3d8e198d..c093589f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ dokka_version=1.7.0-SNAPSHOT dokka_integration_test_parallelism=2 # Versions -kotlin_version=1.6.20 +kotlin_version=1.6.21 coroutines_version=1.6.0 kotlinx_html_version=0.7.3 -kotlin_plugin_version=211-1.6.20-release-275-IJ7442.40 +kotlin_plugin_version=211-1.6.21-release-334-IJ7442.40 jsoup_version=1.14.3 idea_version=211.7442.40 language_version=1.4 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 4ed06b9f..4c9d3694 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.6.20", "1.5.31", "1.4.32"), + kotlinVersions = listOf("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.6.20", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.6.21", "1.5.31", "1.4.32"), androidGradlePluginVersions = listOf("7.1.2") ) + BuildVersions.permutations( gradleVersions = listOf("6.9", *ifExhaustive("6.1.1", "5.6.4")), - kotlinVersions = listOf("1.6.20", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.6.21", "1.5.31", "1.4.32"), androidGradlePluginVersions = listOf("4.0.0", *ifExhaustive("3.6.3")) ) @@ -31,7 +31,6 @@ internal object TestedVersions { "1.5.0" to "-Preact_version=17.0.2-pre.204-kotlin-1.5.0", "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.10" to "-Preact_version=18.0.0-pre.325-kotlin-1.6.10", - "1.6.20" to "-Preact_version=18.0.0-pre.329-kotlin-1.6.20" + "1.6.21" to "-Preact_version=18.0.0-pre.329-kotlin-1.6.20" // TODO update to 1.6.21 when released ) }
\ No newline at end of file |