From 20bb6b0ea805c27918a70e49ec2f2ca9db51c1db Mon Sep 17 00:00:00 2001 From: Pavel Mikhailovskii Date: Fri, 16 Feb 2024 19:27:46 +0000 Subject: [PATCH] [KAPT] KT-64391 Make sure that all K2 KAPT tests really run with K2 Merge-request: KT-MR-14346 Merged-by: Pavel Mikhailovskii --- .../android/Kapt3AndroidIncrementalIT.kt | 4 ++-- .../gradle/android/Kapt4AndroidExternalIT.kt | 6 +++++ .../android/Kapt4AndroidIncrementalIT.kt | 22 +++++++------------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt index 4c57db9411f..e15d429a194 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt @@ -78,7 +78,7 @@ open class Kapt3AndroidIncrementalIT : Kapt3BaseIT() { @DisplayName("incremental compilation works with dagger") @GradleAndroidTest - open fun testAndroidDaggerIC( + fun testAndroidDaggerIC( gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk, @@ -160,7 +160,7 @@ open class Kapt3AndroidIncrementalIT : Kapt3BaseIT() { @DisplayName("inter-project IC works with kapt") @GradleAndroidTest - open fun testInterProjectIC( + fun testInterProjectIC( gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidExternalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidExternalIT.kt index 5b761ab2025..48e3f2c3d9a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidExternalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidExternalIT.kt @@ -6,7 +6,9 @@ package org.jetbrains.kotlin.gradle.android import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.forceKapt4 import org.jetbrains.kotlin.gradle.testbase.JdkVersions +import org.jetbrains.kotlin.gradle.testbase.TestProject import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName @@ -20,4 +22,8 @@ class Kapt4AndroidExternalIT : Kapt3AndroidExternalIT() { agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk, ) {} + + override fun TestProject.customizeProject() { + forceKapt4() + } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt index 79a469619dd..83053ab5e6a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt @@ -5,33 +5,27 @@ package org.jetbrains.kotlin.gradle.android -import org.gradle.util.GradleVersion -import org.jetbrains.kotlin.gradle.testbase.JdkVersions +import org.jetbrains.kotlin.gradle.forceKapt4 +import org.jetbrains.kotlin.gradle.testbase.TestProject import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName @DisplayName("android with kapt4 incremental build tests") +@Disabled("KT-63102 Incremental compilation doesn't work in 2.0") class Kapt4AndroidIncrementalIT : Kapt3AndroidIncrementalIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() - @Disabled("KT-63102 Incremental compilation doesn't work in 2.0") - override fun testAndroidDaggerIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { - } - - @Disabled("KT-63102 Incremental compilation doesn't work in 2.0") - override fun testInterProjectIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { + override fun TestProject.customizeProject() { + forceKapt4() } } @DisplayName("android with kapt4 incremental build tests with precise compilation outputs backup") +@Disabled("KT-63102 Incremental compilation doesn't work in 2.0") class Kapt4AndroidIncrementalWithoutPreciseBackupIT : Kapt3AndroidIncrementalWithoutPreciseBackupIT() { override val defaultBuildOptions = super.defaultBuildOptions.copyEnsuringK2() - @Disabled("KT-63102 Incremental compilation doesn't work in 2.0") - override fun testAndroidDaggerIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { - } - - @Disabled("KT-63102 Incremental compilation doesn't work in 2.0") - override fun testInterProjectIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { + override fun TestProject.customizeProject() { + forceKapt4() } }