From b2627f53a365c934864623699a60f70084cae29e Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 6 Nov 2017 20:51:24 +0300 Subject: [PATCH] Fix resources clashes in ultimate plugin tests Rollback tests-jar configuration to extend testCompile instead of testRuntime. Otherwise an unwanted main artifact from the runtime configuration gets added to the artifacts of tests-jar configuration. Exclude transitive dependencies of projectTests(":idea") --- buildSrc/src/main/kotlin/artifacts.kt | 2 +- ultimate/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index defda542c8a..97f69be42e0 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -37,7 +37,7 @@ fun Project.classesDirsArtifact(): FileCollection { } fun Project.testsJar(body: Jar.() -> Unit = {}): Jar { - val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testRuntime"]) + val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testCompile"]) return task("testsJar") { dependsOn("testClasses") diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 72396141a68..139c80c8fe4 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":idea")) + testCompile(projectTests(":idea")) { isTransitive = false } testCompile(projectTests(":generators:test-generator")) testCompile(commonDep("junit:junit")) testCompile(ideaUltimateSdkDeps("gson"))