From 70ed76e0bdf34aa0d91d764bb8f40d10767fb686 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 27 Jul 2022 01:16:33 +0200 Subject: [PATCH] Drop unused ':dist' dependency in some tests Review: https://jetbrains.team/p/kt/reviews/6753 This commit doesn't fix any issue except for "cleanup". If you find a mistake in this commit feel free to revert part of it/the whole commit I checked every module where I drop ':dist' dependency. Tests still pass in those modules --- analysis/analysis-api/build.gradle.kts | 1 - analysis/analysis-test-framework/build.gradle.kts | 1 - analysis/build.gradle.kts | 1 - analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts | 1 - analysis/decompiled/decompiler-to-psi/build.gradle.kts | 1 - compiler/container/build.gradle.kts | 1 - compiler/fir/modularized-tests/build.gradle.kts | 1 - compiler/tests-against-klib/build.gradle.kts | 1 - native/commonizer-api/build.gradle.kts | 1 - native/commonizer/build.gradle.kts | 1 - plugins/kapt3/kapt3-base/build.gradle.kts | 1 - plugins/lombok/build.gradle.kts | 1 - 12 files changed, 12 deletions(-) diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index a21e5876eed..6d021964071 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/analysis/analysis-api/build.gradle.kts @@ -41,6 +41,5 @@ tasks.withType().configureEach testsJar() projectTest { - dependsOn(":dist") workingDir = rootDir } diff --git a/analysis/analysis-test-framework/build.gradle.kts b/analysis/analysis-test-framework/build.gradle.kts index b4063010b16..92d250e68b2 100644 --- a/analysis/analysis-test-framework/build.gradle.kts +++ b/analysis/analysis-test-framework/build.gradle.kts @@ -26,7 +26,6 @@ sourceSets { } projectTest(jUnitMode = JUnitMode.JUnit5) { - dependsOn(":dist") dependsOn(":plugins:fir-plugin-prototype:plugin-annotations:jar") workingDir = rootDir useJUnitPlatform() diff --git a/analysis/build.gradle.kts b/analysis/build.gradle.kts index c9f5db567e0..6877d92631c 100644 --- a/analysis/build.gradle.kts +++ b/analysis/build.gradle.kts @@ -3,7 +3,6 @@ plugins { } tasks.register("analysisAllTests") { - dependsOn(":dist") dependsOn( ":analysis:decompiled:decompiler-to-file-stubs:test", ":analysis:analysis-api:test", diff --git a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts index d1e0eb979e5..78653a3f537 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts @@ -25,7 +25,6 @@ sourceSets { } projectTest { - dependsOn(":dist") workingDir = rootDir } diff --git a/analysis/decompiled/decompiler-to-psi/build.gradle.kts b/analysis/decompiled/decompiler-to-psi/build.gradle.kts index b8d680107ed..87264759d6f 100644 --- a/analysis/decompiled/decompiler-to-psi/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-psi/build.gradle.kts @@ -22,7 +22,6 @@ sourceSets { } projectTest { - dependsOn(":dist") workingDir = rootDir } diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts index 41d4a0b7dc8..ba9de154f01 100644 --- a/compiler/container/build.gradle.kts +++ b/compiler/container/build.gradle.kts @@ -27,6 +27,5 @@ sourceSets { testsJar {} projectTest(parallel = true) { - dependsOn(":dist") workingDir = rootDir } diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index 1bdc2d54109..ccc66c99324 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -46,7 +46,6 @@ sourceSets { projectTest(minHeapSizeMb = 8192, maxHeapSizeMb = 8192, reservedCodeCacheSizeMb = 512) { systemProperties(project.properties.filterKeys { it.startsWith("fir.") }) workingDir = rootDir - dependsOn(":dist") run { val argsExt = project.findProperty("fir.modularized.jvm.args") as? String diff --git a/compiler/tests-against-klib/build.gradle.kts b/compiler/tests-against-klib/build.gradle.kts index 53653cd42ce..9e94482bf7d 100644 --- a/compiler/tests-against-klib/build.gradle.kts +++ b/compiler/tests-against-klib/build.gradle.kts @@ -23,7 +23,6 @@ sourceSets { testsJar {} projectTest(parallel = true) { - dependsOn(":dist") dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs") workingDir = rootDir systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator)) diff --git a/native/commonizer-api/build.gradle.kts b/native/commonizer-api/build.gradle.kts index 76e5c59492a..1d4b96a6d2c 100644 --- a/native/commonizer-api/build.gradle.kts +++ b/native/commonizer-api/build.gradle.kts @@ -30,7 +30,6 @@ sourceSets { } projectTest(parallel = false) { - dependsOn(":dist") workingDir = projectDir } diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts index 8cf72b13668..ecf32f9d322 100644 --- a/native/commonizer/build.gradle.kts +++ b/native/commonizer/build.gradle.kts @@ -57,7 +57,6 @@ sourceSets { } projectTest(parallel = true) { - dependsOn(":dist") workingDir = rootDir } diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts index 8a07d3e9920..a7ca7a1a3e3 100644 --- a/plugins/kapt3/kapt3-base/build.gradle.kts +++ b/plugins/kapt3/kapt3-base/build.gradle.kts @@ -22,5 +22,4 @@ testsJar {} projectTest { useJUnitPlatform() workingDir = rootDir - dependsOn(":dist") } diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts index bba9e324f6d..dfbe45e84e2 100644 --- a/plugins/lombok/build.gradle.kts +++ b/plugins/lombok/build.gradle.kts @@ -56,7 +56,6 @@ sourceSets { projectTest(parallel = true) { workingDir = rootDir - dependsOn(":dist") } runtimeJar()