From 5782267d26ce0d794e19bb81fbddfc41c247c485 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 30 Apr 2019 21:27:11 +0300 Subject: [PATCH] Build: Fix import of kotlin-reflect in JPS build #KT-29548 Fixed --- compiler/build.gradle.kts | 4 ---- idea/build.gradle.kts | 5 +---- libraries/reflect/build.gradle.kts | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index d95d569baa2..4df76f43370 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -65,10 +65,6 @@ dependencies { antLauncherJar(commonDep("org.apache.ant", "ant")) antLauncherJar(files(toolsJar())) - - if (project.kotlinBuildProperties.isInJpsBuildIdeaSync) { - testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) - } } sourceSets { diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index fd89adcb36c..75ff4aa73a1 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -124,11 +124,8 @@ dependencies { testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("testng")) - - if (project.kotlinBuildProperties.isInJpsBuildIdeaSync) { - testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) - } } + sourceSets { "main" { projectDefault() diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index a428af9ec28..3b44eada871 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -208,7 +208,11 @@ tasks.getByName("check").dependsOn(dexMethodCount) artifacts { listOf(mainJar.name, "runtime", "archives").forEach { configurationName -> - add(configurationName, result) + add( + configurationName, + // idea can correctly import configurations of shadowJar as transitive dependencies which are required by tests + if (kotlinBuildProperties.isInJpsBuildIdeaSync) reflectShadowJar else result + ) } add("archives", modularJar)