From 378ac8daca986d5c1f97a43f21fbf3e1e53de1f9 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Wed, 26 Oct 2022 01:52:53 +0200 Subject: [PATCH] [Gradle] Move ConfigurationCacheForAndroidIT to android subpackage #KT-45748 In Progress --- .../gradle/{ => android}/ConfigurationCacheForAndroidIT.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/{ => android}/ConfigurationCacheForAndroidIT.kt (89%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt index 903a2bbaf9e..5dd20a77051 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt @@ -1,17 +1,18 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.android 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") -@JvmGradlePluginTests +@AndroidGradlePluginTests class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { override val defaultBuildOptions = super.defaultBuildOptions.copy( androidVersion = AGP_42