aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Mishenev <vad-mishenev@yandex.ru>2022-06-10 23:28:42 +0300
committerGitHub <noreply@github.com>2022-06-10 23:28:42 +0300
commit4eb04c7c622254f8e426f5db0bbe2e352c41e12e (patch)
treeb558df9f0c3d9c1eb53619795aede6dcb292ee58
parenta27d4eed180b9949d3028a0b5dc8b7afdc667dd8 (diff)
downloaddokka-4eb04c7c622254f8e426f5db0bbe2e352c41e12e.tar.gz
dokka-4eb04c7c622254f8e426f5db0bbe2e352c41e12e.tar.bz2
dokka-4eb04c7c622254f8e426f5db0bbe2e352c41e12e.zip
Bump Kotlin to 1.7.0 (#2529)
-rw-r--r--gradle.properties4
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt2
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt5
3 files changed, 6 insertions, 5 deletions
diff --git a/gradle.properties b/gradle.properties
index f690e0d3..9fdebea5 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.7.0-RC2
+kotlin_version=1.7.0
coroutines_version=1.6.0
kotlinx_html_version=0.7.3
-kotlin_plugin_version=213-1.7.0-RC2-release-258-IJ6777.52
+kotlin_plugin_version=213-1.7.0-release-281-IJ6777.52
jsoup_version=1.14.3
idea_version=213.6777.52
language_version=1.4
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt
index 3e154197..ef9d67cc 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt
@@ -18,7 +18,7 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract
// some core react classes were moved from `react-router-dom` to `react` artifacts.
// Writing an integration test project that would work for both 1.4.0 and 1.5.0 would involve
// ugly solutions, so these versions are ignored. Not a big loss given they are deprecated as of this moment.
- "1.4.0", "1.4.32", "1.7.0-RC2"
+ "1.4.0", "1.4.32"
)
@BeforeTest
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 c9d2619b..b280c5f2 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-RC2", "1.6.21", "1.5.31", "1.4.32"),
+ kotlinVersions = listOf("1.7.0", "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"))
@@ -31,6 +31,7 @@ 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.21" to "-Preact_version=18.0.0-pre.332-kotlin-1.6.21"
+ "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.343"
)
} \ No newline at end of file