From 4a58e24a4af37f94a51ff0fee2ade8170de15576 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Tue, 17 Jan 2023 01:18:51 +0100
Subject: [PATCH] [Gradle] Rework ConfigurationCacheForAndroidIT to drop
 warnings suppression

---
 .../kotlin/gradle/ConfigurationCacheIT.kt     |  2 +-
 .../android/ConfigurationCacheForAndroidIT.kt | 55 +++++++++++++------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
index 61e4fb5f62d..e71edf33489 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
@@ -255,7 +255,7 @@ abstract class AbstractConfigurationCacheIT : KGPBaseTest() {
         vararg taskNames: String,
         executedTaskNames: List<String>? = null,
         checkUpToDateOnRebuild: Boolean = true,
-        buildOptions: BuildOptions = defaultBuildOptions
+        buildOptions: BuildOptions = this.buildOptions
     ) {
         assertSimpleConfigurationCacheScenarioWorks(
             *taskNames,
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt
index 381f05b2970..07ac7cd1861 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt
@@ -5,27 +5,28 @@
 
 package org.jetbrains.kotlin.gradle.android
 
-import org.gradle.api.logging.configuration.WarningMode
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.AbstractConfigurationCacheIT
 import org.jetbrains.kotlin.gradle.testbase.*
-import org.jetbrains.kotlin.gradle.testbase.TestVersions.AGP.AGP_42
 import org.junit.jupiter.api.DisplayName
 
 @DisplayName("Configuration cache in Android project")
 @AndroidGradlePluginTests
+@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
 class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
-    override val defaultBuildOptions = super.defaultBuildOptions.copy(
-        androidVersion = AGP_42,
-        // Workaround for a deprecation warning from AGP
-        // Relying on FileTrees for ignoring empty directories when using @SkipWhenEmpty has been deprecated.
-        warningMode = WarningMode.None,
-    )
-
     @DisplayName("works in android plus kapt project")
-    @GradleTest
-    fun testAndroidKaptProject(gradleVersion: GradleVersion) {
-        project("kapt2/android-dagger", gradleVersion) {
+    @GradleAndroidTest
+    fun testAndroidKaptProject(
+        gradleVersion: GradleVersion,
+        agpVersion: String,
+        jdkVersion: JdkVersions.ProvidedJdk,
+    ) {
+        project(
+            "kapt2/android-dagger",
+            gradleVersion,
+            buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
+            buildJdk = jdkVersion.location
+        ) {
             gradleProperties.append("\nkapt.incremental.apt=false")
 
             testConfigurationCacheOf(
@@ -37,9 +38,18 @@ class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
     }
 
     @DisplayName("works in android project")
-    @GradleTest
-    fun testKotlinAndroidProject(gradleVersion: GradleVersion) {
-        project("AndroidProject", gradleVersion) {
+    @GradleAndroidTest
+    fun testKotlinAndroidProject(
+        gradleVersion: GradleVersion,
+        agpVersion: String,
+        jdkVersion: JdkVersions.ProvidedJdk,
+    ) {
+        project(
+            "AndroidProject",
+            gradleVersion,
+            buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
+            buildJdk = jdkVersion.location
+        ) {
             testConfigurationCacheOf(
                 ":Lib:compileFlavor1DebugKotlin",
                 ":Android:compileFlavor1DebugKotlin"
@@ -48,9 +58,18 @@ class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
     }
 
     @DisplayName("works with android tests")
-    @GradleTest
-    fun testKotlinAndroidProjectTests(gradleVersion: GradleVersion) {
-        project("AndroidIncrementalMultiModule", gradleVersion) {
+    @GradleAndroidTest
+    fun testKotlinAndroidProjectTests(
+        gradleVersion: GradleVersion,
+        agpVersion: String,
+        jdkVersion: JdkVersions.ProvidedJdk,
+    ) {
+        project(
+            "AndroidIncrementalMultiModule",
+            gradleVersion,
+            buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
+            buildJdk = jdkVersion.location
+        ) {
             testConfigurationCacheOf(
                 ":app:compileDebugAndroidTestKotlin",
                 ":app:compileDebugUnitTestKotlin"