From 4eb04c7c622254f8e426f5db0bbe2e352c41e12e Mon Sep 17 00:00:00 2001
From: Vadim Mishenev <vad-mishenev@yandex.ru>
Date: Fri, 10 Jun 2022 23:28:42 +0300
Subject: Bump Kotlin to 1.7.0 (#2529)
---
.../org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt | 2 +-
.../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'integration-tests/gradle/src')
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
--
cgit