From 22d6906b33cfba7b8bd21d2bd85a4bbafdb662f0 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 10 Aug 2022 17:02:17 +0200 Subject: [PATCH] FIR JS: implement a copy of JS Gradle IT with K2 --- .../gradle/KotlinJsLibraryGradlePluginIT.kt | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt index 89a7451c1a6..2137bba45e4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt @@ -17,10 +17,7 @@ import kotlin.test.assertNotNull // TODO: This suite is failing with deprecation error on Gradle <7.0 versions // Should be fixed via planned fixes in Kotlin/JS plugin: https://youtrack.jetbrains.com/issue/KFC-252 -@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) -@DisplayName("Kotlin/JS IR library") -@JsGradlePluginTests -class KotlinJsIrLibraryGradlePluginIT : KGPBaseTest() { +abstract class KotlinJsIrLibraryGradlePluginITBase : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy( jsOptions = BuildOptions.JsOptions( @@ -75,3 +72,21 @@ class KotlinJsIrLibraryGradlePluginIT : KGPBaseTest() { } } } + +@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) +@DisplayName("Kotlin/JS K1 IR library") +@JsGradlePluginTests +class KotlinK1JsIrLibraryGradlePluginIT : KotlinJsIrLibraryGradlePluginITBase() { + override val defaultBuildOptions = super.defaultBuildOptions.copy( + useFir = false + ) +} + +@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) +@DisplayName("Kotlin/JS K2 IR library") +@JsGradlePluginTests +class KotlinK2JsIrLibraryGradlePluginIT : KotlinJsIrLibraryGradlePluginITBase() { + override val defaultBuildOptions = super.defaultBuildOptions.copy( + useFir = true + ) +}