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")
This commit is contained in:
@@ -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<Jar>("testsJar") {
|
||||
dependsOn("testClasses")
|
||||
|
||||
@@ -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"))
|
||||
|
||||
Reference in New Issue
Block a user