From 54470fe2b74bf5eab463d8b46c801bbfda300e03 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 6 Aug 2018 13:09:50 +0300 Subject: [PATCH] Pill: Remove source dependencies to 'tests-common' 'tests-common' module does only have a test source set so the dependency is redundant. --- compiler/cli/build.gradle.kts | 1 - plugins/allopen/allopen-cli/build.gradle.kts | 1 - .../android-extensions-compiler/build.gradle.kts | 1 - .../android-extensions/android-extensions-idea/build.gradle.kts | 1 - .../android-extensions-idea/build.gradle.kts.173 | 1 - .../android-extensions-idea/build.gradle.kts.as31 | 1 - .../android-extensions-idea/build.gradle.kts.as32 | 1 - .../android-extensions-idea/build.gradle.kts.as33 | 1 - .../android-extensions/android-extensions-jps/build.gradle.kts | 1 - .../android-extensions-jps/build.gradle.kts.173 | 1 - .../android-extensions-jps/build.gradle.kts.as31 | 1 - .../android-extensions-jps/build.gradle.kts.as33 | 1 - plugins/imports-dumper/build.gradle.kts | 2 -- plugins/kapt3/kapt3-compiler/build.gradle.kts | 1 - plugins/kapt3/kapt3-compiler/build.gradle.kts.173 | 1 - plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 | 1 - plugins/noarg/noarg-cli/build.gradle.kts | 1 - .../sam-with-receiver/sam-with-receiver-cli/build.gradle.kts | 1 - 18 files changed, 19 deletions(-) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 8955492db26..125053b9e94 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) } diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index 29a4d5252e6..3665d0259f4 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -18,7 +18,6 @@ dependencies { testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) } diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index c16817a6b37..a929246a8fc 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { testCompile(project(":compiler:util")) testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler:tests-common")) testCompile(project(":kotlin-android-extensions-runtime")) testCompile(projectTests(":compiler:tests-common")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 1eba23251a1..32c9135a419 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -23,7 +23,6 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 index 600b19df9ac..530574bad99 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 @@ -23,7 +23,6 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 index d669ed697ab..1b57bd5d719 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -23,7 +23,6 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 index d669ed697ab..1b57bd5d719 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 @@ -23,7 +23,6 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 index 133e04e6552..4795856d5dc 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 @@ -23,7 +23,6 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts index 4a63b603e9b..6fe29444320 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } testCompile(projectTests(":jps-plugin")) - testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 index 7fb8d78f14e..bf616c36fee 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.173 @@ -15,7 +15,6 @@ dependencies { compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } testCompile(projectTests(":jps-plugin")) - testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 index 712a18454c2..34fcb2520ec 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as31 @@ -15,7 +15,6 @@ dependencies { compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } testCompile(projectTests(":jps-plugin")) - testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 index f6e75842e75..1ed717dfd58 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as33 @@ -15,7 +15,6 @@ dependencies { compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } testCompile(projectTests(":jps-plugin")) - testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) diff --git a/plugins/imports-dumper/build.gradle.kts b/plugins/imports-dumper/build.gradle.kts index 8ce4787909d..f225aa3006f 100644 --- a/plugins/imports-dumper/build.gradle.kts +++ b/plugins/imports-dumper/build.gradle.kts @@ -15,10 +15,8 @@ dependencies { compile(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) - embeddedComponents("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", kotlinxSerializationVersion) { isTransitive = false } } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 30993ad7dfb..6d8d0812d23 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -22,7 +22,6 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all") } - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":kotlin-annotation-processing-base")) testCompile(projectTests(":kotlin-annotation-processing-base")) diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts.173 b/plugins/kapt3/kapt3-compiler/build.gradle.kts.173 index aae1228a8f5..693c2ea2d81 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts.173 +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts.173 @@ -22,7 +22,6 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all") } - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":kotlin-annotation-processing-base")) testCompile(projectTests(":kotlin-annotation-processing-base")) diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 b/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 index aae1228a8f5..693c2ea2d81 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 @@ -22,7 +22,6 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all") } - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":kotlin-annotation-processing-base")) testCompile(projectTests(":kotlin-annotation-processing-base")) diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index 744a22f1288..7ef79c5922d 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -21,7 +21,6 @@ dependencies { testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) } diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index 37e6ee289a7..5438deced0b 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) }