diff --git a/build.gradle.kts b/build.gradle.kts index e41111d8203..5ffc02b6442 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -276,13 +276,16 @@ extra["kotlinJpsPluginEmbeddedDependencies"] = listOf( extra["kotlinJpsPluginMavenDependencies"] = listOf( ":kotlin-daemon-client", ":kotlin-build-common", - ":kotlin-reflect", ":kotlin-util-io", ":kotlin-util-klib", ":kotlin-util-klib-metadata", ":native:kotlin-native-utils" ) +extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] = listOf( + commonDependency("org.jetbrains.kotlin:kotlin-reflect") +) + extra["compilerArtifactsForIde"] = listOfNotNull( ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 0c3e93430d1..142870933e3 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -264,7 +264,7 @@ fun Project.publishProjectJars(projects: List, libraryDependencies: List } for (libraryDependency in libraryDependencies) { - fatJarContents(libraryDependency) + fatJarContents(libraryDependency) { isTransitive = false } } } diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts index 58675c54c4c..861e1831cde 100644 --- a/jps/jps-common/build.gradle.kts +++ b/jps/jps-common/build.gradle.kts @@ -6,14 +6,21 @@ plugins { dependencies { implementation(kotlinStdlib()) + @Suppress("UNCHECKED_CAST") rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] .let { it as List } .forEach { implementation(project(it)) } + @Suppress("UNCHECKED_CAST") rootProject.extra["kotlinJpsPluginMavenDependencies"] .let { it as List } .forEach { implementation(project(it)) } + @Suppress("UNCHECKED_CAST") + rootProject.extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] + .let { it as List } + .forEach { implementation(it) { isTransitive = false } } + compileOnly(intellijUtilRt()) compileOnly(intellijPlatformUtil()) compileOnly(jpsModel()) diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index 2a0069eed00..fe4845d1ce2 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -18,14 +18,21 @@ dependencies { compileOnly(project(":jps:jps-platform-api-signatures")) testImplementation(projectTests(":generators:test-generator")) + @Suppress("UNCHECKED_CAST") rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] .let { it as List } .forEach { implementation(project(it)) } + @Suppress("UNCHECKED_CAST") rootProject.extra["kotlinJpsPluginMavenDependencies"] .let { it as List } .forEach { implementation(project(it)) } + @Suppress("UNCHECKED_CAST") + rootProject.extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] + .let { it as List } + .forEach { implementation(it) { isTransitive = false } } + implementation(project(":jps:jps-common")) compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) compileOnly(jpsModel()) diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts index 03b5ef3a5cd..05fb66eb97a 100644 --- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts @@ -4,8 +4,12 @@ idePluginDependency { val embeddedDependencies = rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] as List @Suppress("UNCHECKED_CAST") val mavenDependencies = rootProject.extra["kotlinJpsPluginMavenDependencies"] as List + val mavenDependenciesLibs = rootProject.extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] as List val otherProjects = listOf(":jps:jps-plugin", ":jps:jps-common") - publishProjectJars(embeddedDependencies + mavenDependencies + otherProjects, libraryDependencies = listOf(protobufFull())) + publishProjectJars( + embeddedDependencies + mavenDependencies + otherProjects, + libraryDependencies = mavenDependenciesLibs + listOf(protobufFull()) + ) } diff --git a/prepare/kotlin-jps-plugin/build.gradle.kts b/prepare/kotlin-jps-plugin/build.gradle.kts index d2a436066b6..afd14965b78 100644 --- a/prepare/kotlin-jps-plugin/build.gradle.kts +++ b/prepare/kotlin-jps-plugin/build.gradle.kts @@ -3,9 +3,15 @@ plugins { } dependencies { + @Suppress("UNCHECKED_CAST") rootProject.extra["kotlinJpsPluginMavenDependencies"] .let { it as List } .forEach { implementation(project(it)) } + + @Suppress("UNCHECKED_CAST") + rootProject.extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] + .let { it as List } + .forEach { implementation(it) { isTransitive = false } } } @Suppress("UNCHECKED_CAST")