diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyBuilder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyBuilder.kt index 0aede436a99..29ef76b8193 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetHierarchyBuilder.kt @@ -141,7 +141,10 @@ interface KotlinTargetHierarchyBuilder { fun withJs() fun withWasm() fun withJvm() + + @Deprecated("Renamed to 'withAndroidTarget''", replaceWith = ReplaceWith("withAndroidTarget()")) fun withAndroid() + fun withAndroidTarget() fun withAndroidNativeX64() fun withAndroidNativeX86() fun withAndroidNativeArm32() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/KotlinTargetHierarchyBuilderImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/KotlinTargetHierarchyBuilderImpl.kt index e787f85cc23..8213d43e29a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/KotlinTargetHierarchyBuilderImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/targetHierarchy/KotlinTargetHierarchyBuilderImpl.kt @@ -56,7 +56,7 @@ private class KotlinTargetHierarchyBuilderImplContext(private val compilation: K } private class KotlinTargetHierarchyBuilderRootImpl( - private val builder: KotlinTargetHierarchyBuilderImpl + private val builder: KotlinTargetHierarchyBuilderImpl, ) : KotlinTargetHierarchyBuilder.Root, KotlinTargetHierarchyBuilder by builder { @@ -161,7 +161,10 @@ private class KotlinTargetHierarchyBuilderImpl( (it is KotlinWithJavaTarget<*, *> && it.platformType == KotlinPlatformType.jvm) } - override fun withAndroid() = withTargets { it is KotlinAndroidTarget } + @Suppress("OVERRIDE_DEPRECATION") + override fun withAndroid() = withAndroidTarget() + + override fun withAndroidTarget() = withTargets { it is KotlinAndroidTarget } override fun withAndroidNativeX64() = withTargets { it is KotlinNativeTarget && it.konanTarget == KonanTarget.ANDROID_X64 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index acbb16d2df5..9813e4db189 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -41,7 +41,7 @@ class IdeJvmAndAndroidDependencyResolutionTest { common { group("jvmAndAndroid") { withJvm() - withAndroid() + withAndroidTarget() } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt index c4f22abcdec..7e3df5e1739 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt @@ -175,7 +175,7 @@ class KotlinTargetHierarchyDslTest { common { group("jvmAndAndroid") { withJvm() - withAndroid() + withAndroidTarget() } } }