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

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"))

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 {

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 {

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())
 }

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()
 }
 

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 {

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"))
 

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 {

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()
 }