Build: Fix import of kotlin-reflect in JPS build
#KT-29548 Fixed
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user