diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 65be9b10dac..cedb9b6cf0c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -29,7 +29,7 @@ class IncrementalCompilationJsMultiProjectIT : BaseIncrementalCompilationMultiPr get() = "compileKotlin2Js" } -class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiProjectIT() { +open class IncrementalCompilationJvmMultiProjectIT : BaseIncrementalCompilationMultiProjectIT() { override val additionalLibDependencies: String = "implementation \"org.jetbrains.kotlin:kotlin-test:${'$'}kotlin_version\"" @@ -139,6 +139,12 @@ open class A { } } +class IncrementalCompilationFirJvmMultiProjectIT : IncrementalCompilationJvmMultiProjectIT() { + override fun defaultBuildOptions(): BuildOptions { + return super.defaultBuildOptions().copy(useFir = true) + } +} + abstract class BaseIncrementalCompilationMultiProjectIT : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy(withDaemon = true, incremental = true) @@ -194,6 +200,9 @@ open class A { @Test fun testLibClassBecameFinal() { + // TODO: fix fir IC and remove + if (defaultBuildOptions().useFir) return + val project = defaultProject() project.build("build") { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt index 0624c924139..b49b1391de7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalJavaChangeIT.kt @@ -34,7 +34,7 @@ class IncrementalJavaChangePreciseIT : IncrementalCompilationJavaChangesBase(use } } -class IncrementalJavaChangeDisablePreciseIT : IncrementalCompilationJavaChangesBase(usePreciseJavaTracking = false) { +open class IncrementalJavaChangeDisablePreciseIT : IncrementalCompilationJavaChangesBase(usePreciseJavaTracking = false) { @Test override fun testModifySignatureTrackedJavaInLib() { doTest( @@ -58,6 +58,12 @@ class IncrementalJavaChangeDisablePreciseIT : IncrementalCompilationJavaChangesB } } +class IncrementalFirJavaChangeDisablePreciseIT : IncrementalJavaChangeDisablePreciseIT() { + override fun defaultBuildOptions(): BuildOptions { + return super.defaultBuildOptions().copy(useFir = true) + } +} + abstract class IncrementalCompilationJavaChangesBase(val usePreciseJavaTracking: Boolean?) : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy(withDaemon = true, incremental = true)