From 9f12dae117baeb3b81e8c82bd71adf2457045cdf Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 25 May 2023 22:53:58 +0200 Subject: [PATCH] [repo] fix KGP pom has multiple dependencies on KGP-api --- buildSrc/src/main/kotlin/GradleCommon.kt | 8 +++++++- .../tools/kotlin-gradle-plugin/build.gradle.kts | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt index 628fb5d2d0e..3bdf6f30e42 100644 --- a/buildSrc/src/main/kotlin/GradleCommon.kt +++ b/buildSrc/src/main/kotlin/GradleCommon.kt @@ -104,7 +104,13 @@ fun Project.excludeGradleCommonDependencies(sourceSet: SourceSet) { configurations[sourceSet.runtimeOnlyConfigurationName].excludeGradleCommonDependencies() } -private val testPlugins = setOf("kotlin-gradle-plugin-api", "android-test-fixes", "gradle-warnings-detector", "kotlin-compiler-args-properties") +private val testPlugins = setOf( + "kotlin-gradle-plugin-api", + "android-test-fixes", + "gradle-warnings-detector", + "kotlin-compiler-args-properties", + "kotlin-gradle-plugin", +) /** * Common sources for all variants. diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 0070ee74487..2c31ff3fc5f 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -44,6 +44,18 @@ dependencies { commonApi(project(":kotlin-gradle-plugin-api")) commonApi(project(":kotlin-gradle-plugin-model")) + // Following two dependencies is a workaround for IDEA import to pick-up them correctly + commonCompileOnly(project(":kotlin-gradle-plugin-api")) { + capabilities { + requireCapability("org.jetbrains.kotlin:kotlin-gradle-plugin-api-common") + } + } + commonCompileOnly(project(":kotlin-gradle-plugin-model")) { + capabilities { + requireCapability("org.jetbrains.kotlin:kotlin-gradle-plugin-model-common") + } + } + commonCompileOnly(project(":compiler:incremental-compilation-impl")) commonCompileOnly(project(":daemon-common")) commonCompileOnly(project(":kotlin-daemon-client"))