From 1eb086282025e1cbfae41ed56e6c02745071eda6 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 31 May 2023 14:28:27 +0200 Subject: [PATCH] [Analysis, build] replace testApi -> testImplementation in build.gradle.kts where it's possible --- analysis/analysis-api-fe10/build.gradle.kts | 5 ++-- analysis/analysis-api-fir/build.gradle.kts | 27 ++++++++++--------- .../build.gradle.kts | 6 ++--- .../analysis-api-impl-base/build.gradle.kts | 21 ++++++++------- .../analysis-api-standalone/build.gradle.kts | 11 ++++---- .../analysis-test-framework/build.gradle.kts | 20 +++++++------- analysis/low-level-api-fir/build.gradle.kts | 18 ++++++------- .../symbol-light-classes/build.gradle.kts | 2 ++ .../analysis-api-generator/build.gradle.kts | 24 +++++++++-------- 9 files changed, 72 insertions(+), 62 deletions(-) diff --git a/analysis/analysis-api-fe10/build.gradle.kts b/analysis/analysis-api-fe10/build.gradle.kts index 4557027c29b..8e39a7656a8 100644 --- a/analysis/analysis-api-fe10/build.gradle.kts +++ b/analysis/analysis-api-fe10/build.gradle.kts @@ -19,9 +19,10 @@ dependencies { testApiJUnit5() testImplementation(project(":analysis:analysis-api-providers")) + testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) testImplementation(projectTests(":compiler:tests-common")) - testImplementation(projectTests(":compiler:test-infrastructure-utils")) - testImplementation(projectTests(":compiler:test-infrastructure")) + testApi(projectTests(":compiler:test-infrastructure-utils")) + testApi(projectTests(":compiler:test-infrastructure")) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) testImplementation(projectTests(":analysis:analysis-api-impl-base")) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index 82f0dd3a1e5..bc269aff0c3 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -26,23 +26,24 @@ dependencies { implementation(project(":analysis:analysis-internal-utils")) implementation(project(":analysis:kt-references")) - testApi(projectTests(":analysis:low-level-api-fir")) - testApi(projectTests(":compiler:tests-common")) + testImplementation(projectTests(":analysis:low-level-api-fir")) + testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) + testImplementation(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure")) - testApi(projectTests(":compiler:tests-common-new")) - testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testApi(projectTests(":analysis:analysis-api-impl-base")) - testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) - testApi(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) - testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) - testApi(project(":analysis:decompiled:decompiler-to-psi")) - testApi(project(":kotlin-test:kotlin-test-junit")) - testImplementation(projectTests(":analysis:analysis-test-framework")) + testImplementation(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) + testImplementation(projectTests(":analysis:analysis-api-impl-base")) + testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) + testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(project(":analysis:decompiled:decompiler-to-psi")) + testImplementation(project(":kotlin-test:kotlin-test-junit")) + testApi(projectTests(":analysis:analysis-test-framework")) - testApi(toolsJar()) + testImplementation(toolsJar()) testApiJUnit5() - testApi(project(":analysis:symbol-light-classes")) + testImplementation(project(":analysis:symbol-light-classes")) } sourceSets { diff --git a/analysis/analysis-api-impl-barebone/build.gradle.kts b/analysis/analysis-api-impl-barebone/build.gradle.kts index fc74ba5558e..5de5a586d8a 100644 --- a/analysis/analysis-api-impl-barebone/build.gradle.kts +++ b/analysis/analysis-api-impl-barebone/build.gradle.kts @@ -10,11 +10,11 @@ dependencies { api(intellijCore()) testApiJUnit5() - testApi(project(":kotlin-test:kotlin-test-junit")) - testApi(projectTests(":compiler:tests-common")) + testImplementation(project(":kotlin-test:kotlin-test-junit")) + testImplementation(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure")) - testApi(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":compiler:tests-common-new")) } sourceSets { diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index a9564eb3745..c7fd03810c4 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -13,18 +13,19 @@ dependencies { implementation(project(":analysis:analysis-internal-utils")) testApiJUnit5() - testApi(project(":kotlin-test:kotlin-test-junit")) - testApi(project(":analysis:analysis-api")) - testApi(projectTests(":compiler:tests-common")) + testImplementation(project(":kotlin-test:kotlin-test-junit")) + testImplementation(project(":analysis:analysis-api")) + testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) + testImplementation(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure")) - testApi(projectTests(":compiler:tests-common-new")) - testApi(projectTests(":analysis:analysis-api-impl-barebone")) - testApi(project(":analysis:symbol-light-classes")) - testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) - testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) - testApi(project(":analysis:decompiled:decompiler-to-psi")) - testApi(projectTests(":analysis:analysis-test-framework")) + testImplementation(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) + testImplementation(project(":analysis:symbol-light-classes")) + testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(project(":analysis:decompiled:decompiler-to-psi")) + testImplementation(projectTests(":analysis:analysis-test-framework")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(toolsJar()) } diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts index 27a1a63b965..86dfef53677 100644 --- a/analysis/analysis-api-standalone/build.gradle.kts +++ b/analysis/analysis-api-standalone/build.gradle.kts @@ -15,12 +15,13 @@ dependencies { api(project(":analysis:decompiled:light-classes-for-decompiled")) api(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) implementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) - testApi(projectTests(":analysis:analysis-test-framework")) - testApi(projectTests(":analysis:analysis-api-impl-base")) - testApi(projectTests(":analysis:analysis-api-fir")) + testImplementation(projectTests(":analysis:analysis-test-framework")) + testImplementation(projectTests(":analysis:low-level-api-fir")) + testImplementation(projectTests(":analysis:analysis-api-impl-base")) + testImplementation(projectTests(":analysis:analysis-api-fir")) - testApi(project(":kotlin-test:kotlin-test-junit")) - testApi(toolsJar()) + testImplementation(project(":kotlin-test:kotlin-test-junit")) + testImplementation(toolsJar()) testApiJUnit5() } diff --git a/analysis/analysis-test-framework/build.gradle.kts b/analysis/analysis-test-framework/build.gradle.kts index 92d250e68b2..d452097cea7 100644 --- a/analysis/analysis-test-framework/build.gradle.kts +++ b/analysis/analysis-test-framework/build.gradle.kts @@ -4,20 +4,22 @@ plugins { } dependencies { - testApi(kotlinStdlib()) - testApi(intellijCore()) + testImplementation(kotlinStdlib()) + testImplementation(intellijCore()) testApiJUnit5() - testApi(project(":kotlin-test:kotlin-test-junit")) + testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":analysis:analysis-internal-utils")) - testApi(project(":compiler:psi")) - testApi(project(":analysis:kt-references")) + testImplementation(project(":compiler:psi")) + testImplementation(project(":analysis:kt-references")) testApi(projectTests(":compiler:tests-common-new")) - testApi(project(":analysis:analysis-api-providers")) - testApi(project(":analysis:analysis-api")) + testApi(projectTests(":compiler:tests-common")) + testImplementation(project(":analysis:analysis-api-providers")) + testImplementation(project(":analysis:analysis-api")) testApi(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) - testApi(project(":analysis:analysis-api-impl-barebone")) - testApi(project(":analysis:analysis-api-impl-base")) + testApi(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) + testImplementation(project(":analysis:analysis-api-impl-barebone")) + testImplementation(project(":analysis:analysis-api-impl-base")) } sourceSets { diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts index 2cad9cf1f62..7ab6219912a 100644 --- a/analysis/low-level-api-fir/build.gradle.kts +++ b/analysis/low-level-api-fir/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { api(project(":analysis:analysis-api-impl-barebone")) api(project(":js:js.config")) api(project(":compiler:cli-common")) - testApi(project(":analysis:analysis-api-fir")) + testImplementation(project(":analysis:analysis-api-fir")) implementation(project(":compiler:frontend.common")) implementation(project(":compiler:fir:entrypoint")) implementation(project(":analysis:analysis-api-providers")) @@ -38,17 +38,17 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure")) - testApi(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":compiler:tests-common-new")) testImplementation("org.opentest4j:opentest4j:1.2.0") testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) - testApi(toolsJar()) - testApi(projectTests(":compiler:tests-common")) - testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testApi(projectTests(":analysis:analysis-api-impl-barebone")) - testApi(projectTests(":analysis:analysis-test-framework")) - testApi(projectTests(":analysis:analysis-api-impl-base")) - testApi(project(":kotlin-test:kotlin-test-junit")) + testImplementation(toolsJar()) + testImplementation(projectTests(":compiler:tests-common")) + testImplementation(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) + testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) + testImplementation(projectTests(":analysis:analysis-test-framework")) + testImplementation(projectTests(":analysis:analysis-api-impl-base")) + testImplementation(project(":kotlin-test:kotlin-test-junit")) testApiJUnit5() testImplementation(project(":analysis:symbol-light-classes")) diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts index c6e093d9742..40d50d02aad 100644 --- a/analysis/symbol-light-classes/build.gradle.kts +++ b/analysis/symbol-light-classes/build.gradle.kts @@ -18,10 +18,12 @@ dependencies { implementation(kotlinxCollectionsImmutable()) testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(projectTests(":analysis:analysis-test-framework")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:analysis-api-fir")) testImplementation(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":analysis:low-level-api-fir")) } sourceSets { diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts index 1159fec0475..bf2eeb81ca2 100644 --- a/generators/analysis-api-generator/build.gradle.kts +++ b/generators/analysis-api-generator/build.gradle.kts @@ -11,17 +11,19 @@ sourceSets { dependencies { api(kotlinStdlib("jdk8")) - testApi(projectTests(":generators:test-generator")) - testApi(projectTests(":compiler:tests-common")) - testApi(projectTests(":compiler:tests-spec")) - testApi(projectTests(":analysis:low-level-api-fir")) - testApi(projectTests(":analysis:analysis-api-fir")) - testApi(projectTests(":analysis:analysis-api-fe10")) - testApi(projectTests(":analysis:analysis-api-standalone")) - testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) - testApi(projectTests(":analysis:decompiled:decompiler-to-psi")) - testApi(projectTests(":analysis:symbol-light-classes")) - testApi(intellijCore()) + testImplementation(projectTests(":generators:test-generator")) + testImplementation(projectTests(":compiler:tests-common")) + testImplementation(projectTests(":compiler:tests-spec")) + testImplementation(projectTests(":analysis:low-level-api-fir")) + testImplementation(projectTests(":analysis:analysis-api-fir")) + testImplementation(projectTests(":analysis:analysis-api-fe10")) + testImplementation(projectTests(":analysis:analysis-api-standalone")) + testImplementation(projectTests(":analysis:analysis-api-impl-base")) + testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) + testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) + testImplementation(projectTests(":analysis:decompiled:decompiler-to-psi")) + testImplementation(projectTests(":analysis:symbol-light-classes")) + testImplementation(intellijCore()) testApiJUnit5() }