From ac51e7b40715b4a695dcc81d302920b4b92666ff Mon Sep 17 00:00:00 2001 From: strangepleasures Date: Fri, 13 Oct 2023 16:23:14 +0000 Subject: [PATCH] KT-61628 [KAPT] Re-enable testAndroidDaggerIC in K2 --- .../kotlin/gradle/android/Kapt3AndroidIncrementalIT.kt | 2 +- .../kotlin/gradle/android/Kapt4AndroidIncrementalIT.kt | 9 --------- 2 files changed, 1 insertion(+), 10 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 707b2fc1224..7f0bcdbe7f0 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, 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 19f2d587bb1..1d0896e13bc 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,11 +5,8 @@ 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 @DisplayName("android with kapt4 incremental build tests") @@ -19,9 +16,6 @@ class Kapt4AndroidIncrementalIT : Kapt3AndroidIncrementalIT() { override fun TestProject.customizeProject() { forceKapt4() } - - @Disabled("See KT-61628") - override fun testAndroidDaggerIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) {} } @DisplayName("android with kapt4 incremental build tests with precise compilation outputs backup") @@ -31,7 +25,4 @@ class Kapt4AndroidIncrementalWithPreciseBackupIT : Kapt3AndroidIncrementalWithPr override fun TestProject.customizeProject() { forceKapt4() } - - @Disabled("See KT-61628") - override fun testAndroidDaggerIC(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) {} }