azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Analysis, build] replace testApi -> testImplementation in build.gradle.kts where it's possible

Browse Source
This commit is contained in:
Ilya Kirillov
2023-05-31 14:28:27 +02:00
committed by Space Team
parent 78f09409b7
commit 1eb0862820
9 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/build.gradle.kts
+3 -2
View File
@@ -19,9 +19,10 @@ dependencies {
testApiJUnit5() testApiJUnit5()
testImplementation(project(":analysis:analysis-api-providers")) testImplementation(project(":analysis:analysis-api-providers"))
testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base"))
testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure-utils"))
testImplementation(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure"))
testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common-new"))
testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone"))
testImplementation(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
analysis/analysis-api-fir/build.gradle.kts
+14 -13
View File
@@ -26,23 +26,24 @@ dependencies {
implementation(project(":analysis:analysis-internal-utils")) implementation(project(":analysis:analysis-internal-utils"))
implementation(project(":analysis:kt-references")) implementation(project(":analysis:kt-references"))
testApi(projectTests(":analysis:low-level-api-fir")) testImplementation(projectTests(":analysis:low-level-api-fir"))
testApi(projectTests(":compiler:tests-common")) 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-utils"))
testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common-new"))
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) testImplementation(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
testApi(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs"))
testApi(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base"))
testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
testApi(project(":analysis:decompiled:decompiler-to-psi")) testImplementation(project(":analysis:decompiled:decompiler-to-psi"))
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testImplementation(projectTests(":analysis:analysis-test-framework")) testApi(projectTests(":analysis:analysis-test-framework"))
testApi(toolsJar()) testImplementation(toolsJar())
testApiJUnit5() testApiJUnit5()
testApi(project(":analysis:symbol-light-classes")) testImplementation(project(":analysis:symbol-light-classes"))
} }
sourceSets { sourceSets {
analysis/analysis-api-impl-barebone/build.gradle.kts
+3 -3
View File
@@ -10,11 +10,11 @@ dependencies {
api(intellijCore()) api(intellijCore())
testApiJUnit5() testApiJUnit5()
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testApi(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common"))
testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common-new"))
} }
sourceSets { sourceSets {
analysis/analysis-api-impl-base/build.gradle.kts
+11 -10
View File
@@ -13,18 +13,19 @@ dependencies {
implementation(project(":analysis:analysis-internal-utils")) implementation(project(":analysis:analysis-internal-utils"))
testApiJUnit5() testApiJUnit5()
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testApi(project(":analysis:analysis-api")) testImplementation(project(":analysis:analysis-api"))
testApi(projectTests(":compiler:tests-common")) 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-utils"))
testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common-new"))
testApi(projectTests(":analysis:analysis-api-impl-barebone")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone"))
testApi(project(":analysis:symbol-light-classes")) testImplementation(project(":analysis:symbol-light-classes"))
testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs"))
testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
testApi(project(":analysis:decompiled:decompiler-to-psi")) testImplementation(project(":analysis:decompiled:decompiler-to-psi"))
testApi(projectTests(":analysis:analysis-test-framework")) testImplementation(projectTests(":analysis:analysis-test-framework"))
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
testImplementation(toolsJar()) testImplementation(toolsJar())
} }
analysis/analysis-api-standalone/build.gradle.kts
+6 -5
View File
@@ -15,12 +15,13 @@ dependencies {
api(project(":analysis:decompiled:light-classes-for-decompiled")) api(project(":analysis:decompiled:light-classes-for-decompiled"))
api(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) api(project(":analysis:analysis-api-standalone:analysis-api-standalone-base"))
implementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) implementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base"))
testApi(projectTests(":analysis:analysis-test-framework")) testImplementation(projectTests(":analysis:analysis-test-framework"))
testApi(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:low-level-api-fir"))
testApi(projectTests(":analysis:analysis-api-fir")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
testImplementation(projectTests(":analysis:analysis-api-fir"))
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testApi(toolsJar()) testImplementation(toolsJar())
testApiJUnit5() testApiJUnit5()
} }
analysis/analysis-test-framework/build.gradle.kts
+11 -9
View File
@@ -4,20 +4,22 @@ plugins {
} }
dependencies { dependencies {
testApi(kotlinStdlib()) testImplementation(kotlinStdlib())
testApi(intellijCore()) testImplementation(intellijCore())
testApiJUnit5() testApiJUnit5()
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testImplementation(project(":analysis:analysis-internal-utils")) testImplementation(project(":analysis:analysis-internal-utils"))
testApi(project(":compiler:psi")) testImplementation(project(":compiler:psi"))
testApi(project(":analysis:kt-references")) testImplementation(project(":analysis:kt-references"))
testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":compiler:tests-common-new"))
testApi(project(":analysis:analysis-api-providers")) testApi(projectTests(":compiler:tests-common"))
testApi(project(":analysis:analysis-api")) 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-standalone:analysis-api-standalone-base"))
testApi(project(":analysis:analysis-api-impl-barebone")) testApi(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base"))
testApi(project(":analysis:analysis-api-impl-base")) testImplementation(project(":analysis:analysis-api-impl-barebone"))
testImplementation(project(":analysis:analysis-api-impl-base"))
} }
sourceSets { sourceSets {
analysis/low-level-api-fir/build.gradle.kts
+9 -9
View File
@@ -21,7 +21,7 @@ dependencies {
api(project(":analysis:analysis-api-impl-barebone")) api(project(":analysis:analysis-api-impl-barebone"))
api(project(":js:js.config")) api(project(":js:js.config"))
api(project(":compiler:cli-common")) 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:frontend.common"))
implementation(project(":compiler:fir:entrypoint")) implementation(project(":compiler:fir:entrypoint"))
implementation(project(":analysis:analysis-api-providers")) implementation(project(":analysis:analysis-api-providers"))
@@ -38,17 +38,17 @@ dependencies {
testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(projectTests(":compiler:test-infrastructure")) 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("org.opentest4j:opentest4j:1.2.0")
testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base")) testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base"))
testApi(toolsJar()) testImplementation(toolsJar())
testApi(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common"))
testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) testImplementation(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
testApi(projectTests(":analysis:analysis-api-impl-barebone")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone"))
testApi(projectTests(":analysis:analysis-test-framework")) testImplementation(projectTests(":analysis:analysis-test-framework"))
testApi(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
testApi(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":kotlin-test:kotlin-test-junit"))
testApiJUnit5() testApiJUnit5()
testImplementation(project(":analysis:symbol-light-classes")) testImplementation(project(":analysis:symbol-light-classes"))
analysis/symbol-light-classes/build.gradle.kts
+2
View File
@@ -18,10 +18,12 @@ dependencies {
implementation(kotlinxCollectionsImmutable()) implementation(kotlinxCollectionsImmutable())
testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) 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:decompiled:decompiler-to-file-stubs"))
testImplementation(projectTests(":analysis:analysis-api-impl-base")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
testImplementation(projectTests(":analysis:analysis-api-fir")) testImplementation(projectTests(":analysis:analysis-api-fir"))
testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common-new"))
testImplementation(projectTests(":analysis:low-level-api-fir"))
} }
sourceSets { sourceSets {
generators/analysis-api-generator/build.gradle.kts
+13 -11
View File
@@ -11,17 +11,19 @@ sourceSets {
dependencies { dependencies {
api(kotlinStdlib("jdk8")) api(kotlinStdlib("jdk8"))
testApi(projectTests(":generators:test-generator")) testImplementation(projectTests(":generators:test-generator"))
testApi(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common"))
testApi(projectTests(":compiler:tests-spec")) testImplementation(projectTests(":compiler:tests-spec"))
testApi(projectTests(":analysis:low-level-api-fir")) testImplementation(projectTests(":analysis:low-level-api-fir"))
testApi(projectTests(":analysis:analysis-api-fir")) testImplementation(projectTests(":analysis:analysis-api-fir"))
testApi(projectTests(":analysis:analysis-api-fe10")) testImplementation(projectTests(":analysis:analysis-api-fe10"))
testApi(projectTests(":analysis:analysis-api-standalone")) testImplementation(projectTests(":analysis:analysis-api-standalone"))
testApi(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(projectTests(":analysis:analysis-api-impl-base"))
testApi(projectTests(":analysis:decompiled:decompiler-to-psi")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone"))
testApi(projectTests(":analysis:symbol-light-classes")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs"))
testApi(intellijCore()) testImplementation(projectTests(":analysis:decompiled:decompiler-to-psi"))
testImplementation(projectTests(":analysis:symbol-light-classes"))
testImplementation(intellijCore())
testApiJUnit5() testApiJUnit5()
} }