From bba96901569b31e6d59ee0057826129f2bc41c08 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Fri, 27 Oct 2023 03:27:55 +0300 Subject: [PATCH] Fix integration tests --- .../gradle/projects/it-multiplatform-0/build.gradle.kts | 2 +- .../gradle/projects/it-wasm-basic/build.gradle.kts | 2 +- .../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts index ab7a8fb5ab..a00b4b8d45 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts +++ b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { jvm() linuxX64("linux") macosX64("macos") - js(BOTH) + js(IR) // Starting with Kotlin 1.9.0, using compiler types LEGACY or BOTH leads to an error. //TODO Add wasm when kx.coroutines will be supported and published into the main repo sourceSets { val commonMain by sourceSets.getting diff --git a/integration-tests/gradle/projects/it-wasm-basic/build.gradle.kts b/integration-tests/gradle/projects/it-wasm-basic/build.gradle.kts index 251d1b8fab..bafd5985dd 100644 --- a/integration-tests/gradle/projects/it-wasm-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-wasm-basic/build.gradle.kts @@ -20,7 +20,7 @@ repositories { kotlin { wasm() sourceSets { - val wasmMain by getting { + val wasmJsMain by getting { dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4-wasm1") implementation("org.jetbrains.kotlinx:atomicfu-wasm:0.18.5-wasm1") 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 e95fa140f2..e4634c0911 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 @@ -14,7 +14,7 @@ internal open class AllSupportedTestedVersionsArgumentsProvider : TestedVersions internal object TestedVersions { - val LATEST = BuildVersions("7.6.2", "1.9.20-RC") + val LATEST = BuildVersions("7.6.2", "1.9.20-RC2") /** * All supported Gradle/Kotlin versions, including [LATEST] @@ -61,6 +61,7 @@ internal object TestedVersions { "1.8.20" to "18.2.0-pre.546", "1.9.0" to "18.2.0-pre.597", "1.9.10" to "18.2.0-pre.597", + "1.9.20-RC2" to "18.2.0-pre.635", ) }