From 1ddd90bba11f46edd827903697889888345aae0f Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 24 Mar 2022 12:00:11 +0100 Subject: [PATCH] Migrate 'android-test-fixes' module to variants ^KT-49227 In Progress --- .../tools/gradle/android-test-fixes/build.gradle.kts | 10 +++++----- .../test/fixes/android/AndroidTestFixesPlugin.kt | 0 .../gradle/test/fixes/android/TestFixesProperties.kt | 0 .../test/fixes/android/fixes/debugKeystoreFix.kt | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename libraries/tools/gradle/android-test-fixes/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt (100%) rename libraries/tools/gradle/android-test-fixes/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt (100%) rename libraries/tools/gradle/android-test-fixes/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt (100%) diff --git a/libraries/tools/gradle/android-test-fixes/build.gradle.kts b/libraries/tools/gradle/android-test-fixes/build.gradle.kts index d7e06363710..cab0d505bd3 100644 --- a/libraries/tools/gradle/android-test-fixes/build.gradle.kts +++ b/libraries/tools/gradle/android-test-fixes/build.gradle.kts @@ -9,11 +9,11 @@ repositories { } dependencies { - compileOnly(gradleKotlinDsl()) - compileOnly("com.android.tools.build:gradle:3.4.0") - compileOnly("com.android.tools.build:gradle-api:3.4.0") - compileOnly("com.android.tools.build:builder:3.4.0") - compileOnly("com.android.tools.build:builder-model:3.4.0") + commonCompileOnly(gradleKotlinDsl()) + commonCompileOnly("com.android.tools.build:gradle:3.4.0") + commonCompileOnly("com.android.tools.build:gradle-api:3.4.0") + commonCompileOnly("com.android.tools.build:builder:3.4.0") + commonCompileOnly("com.android.tools.build:builder-model:3.4.0") } gradlePlugin { diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt b/libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt similarity index 100% rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt b/libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt similarity index 100% rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt b/libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt similarity index 100% rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt