From ab146bd6d496158d56b00d314e402b7c9c254b3d Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 7 Jul 2021 00:27:29 +0300 Subject: [PATCH] Build: Fix deprecated Gradle configurations usages for migration to Gradle 7+ #KTI-559 --- analysis/analysis-api-fir/build.gradle.kts | 40 ++++---- analysis/analysis-api/build.gradle.kts | 2 +- analysis/low-level-api-fir/build.gradle.kts | 38 ++++---- ant/build.gradle.kts | 6 +- benchmarks/build.gradle.kts | 18 ++-- build-common/build.gradle.kts | 10 +- buildSrc/src/main/kotlin/artifacts.kt | 2 +- buildSrc/src/main/kotlin/dependencies.kt | 6 +- buildSrc/src/main/kotlin/instrument.kt | 2 +- compiler/android-tests/build.gradle.kts | 42 ++++---- compiler/backend-common/build.gradle.kts | 6 +- compiler/backend/build.gradle.kts | 12 +-- compiler/build.gradle.kts | 34 +++---- compiler/cli/build.gradle.kts | 60 ++++++------ compiler/cli/cli-common/build.gradle.kts | 10 +- compiler/cli/cli-js/build.gradle.kts | 28 +++--- compiler/cli/cli-runner/build.gradle.kts | 2 +- compiler/compiler-runner/build.gradle.kts | 6 +- compiler/container/build.gradle.kts | 14 +-- compiler/daemon/build.gradle.kts | 4 +- .../daemon/daemon-client-new/build.gradle.kts | 4 +- .../daemon/daemon-common-new/build.gradle.kts | 6 +- .../daemon/daemon-common/build.gradle.kts | 8 +- compiler/daemon/daemon-tests/build.gradle.kts | 20 ++-- .../raw-fir/light-tree2fir/build.gradle.kts | 2 +- compiler/frontend.common/build.gradle.kts | 4 +- compiler/frontend.java/build.gradle.kts | 12 +-- compiler/frontend/build.gradle.kts | 24 ++--- compiler/frontend/cfg/build.gradle.kts | 2 +- .../build.gradle.kts | 40 ++++---- compiler/ir/backend.common/build.gradle.kts | 10 +- compiler/ir/backend.js/build.gradle.kts | 22 ++--- compiler/ir/backend.jvm/build.gradle.kts | 8 +- compiler/ir/backend.wasm/build.gradle.kts | 22 ++--- compiler/ir/ir.ir2cfg/build.gradle.kts | 6 +- compiler/ir/ir.psi2ir/build.gradle.kts | 8 +- compiler/ir/ir.tree.impl/build.gradle.kts | 2 +- .../ir/serialization.common/build.gradle.kts | 10 +- compiler/ir/serialization.js/build.gradle.kts | 3 +- .../ir/serialization.jvm/build.gradle.kts | 10 +- compiler/javac-wrapper/build.gradle.kts | 4 +- compiler/light-classes/build.gradle.kts | 8 +- compiler/plugin-api/build.gradle.kts | 4 +- compiler/psi/build.gradle.kts | 11 +-- compiler/resolution/build.gradle.kts | 4 +- compiler/serialization/build.gradle.kts | 4 +- compiler/tests-against-klib/build.gradle.kts | 4 +- compiler/tests-common-jvm6/build.gradle.kts | 4 +- compiler/tests-common/build.gradle.kts | 96 +++++++++---------- .../tests-compiler-utils/build.gradle.kts | 46 ++++----- compiler/tests-different-jdk/build.gradle.kts | 8 +- compiler/tests-java8/build.gradle.kts | 10 +- compiler/tests-spec/build.gradle.kts | 10 +- compiler/util-klib-metadata/build.gradle.kts | 6 +- compiler/util-klib/build.gradle.kts | 4 +- compiler/visualizer/build.gradle.kts | 2 +- compiler/visualizer/common/build.gradle.kts | 2 +- .../visualizer/render-fir/build.gradle.kts | 6 +- .../visualizer/render-psi/build.gradle.kts | 4 +- core/compiler.common/build.gradle.kts | 6 +- core/descriptors.jvm/build.gradle.kts | 10 +- core/descriptors.runtime/build.gradle.kts | 4 +- core/descriptors/build.gradle.kts | 8 +- core/deserialization/build.gradle.kts | 8 +- core/metadata/build.gradle.kts | 4 +- .../analysis-api-generator/build.gradle.kts | 14 +-- generators/build.gradle.kts | 48 +++++----- generators/test-generator/build.gradle.kts | 10 +- js/js.ast/build.gradle.kts | 2 +- js/js.dce/build.gradle.kts | 6 +- js/js.engines/build.gradle.kts | 8 +- js/js.frontend/build.gradle.kts | 12 +-- js/js.parser/build.gradle.kts | 2 +- js/js.serializer/build.gradle.kts | 10 +- js/js.tests/build.gradle.kts | 48 +++++----- js/js.translator/build.gradle.kts | 14 +-- .../Interop/Indexer/build.gradle.kts | 4 +- kotlin-native/backend.native/build.gradle | 52 +++++----- .../backend.native/tests/build.gradle | 41 ++++---- kotlin-native/klib/build.gradle | 2 +- .../build.gradle.kts | 2 +- .../build.gradle | 4 +- .../build.gradle.kts | 18 ++-- .../build.gradle.kts | 18 ++-- .../jvm-embeddable-host/build.gradle.kts | 4 +- .../jvm-maven-deps/host/build.gradle.kts | 8 +- .../jvm-maven-deps/script/build.gradle.kts | 8 +- .../jvm-simple-script/host/build.gradle.kts | 8 +- .../jvm-simple-script/script/build.gradle.kts | 2 +- .../annotations-common/build.gradle | 4 +- libraries/kotlin.test/common/build.gradle | 4 +- libraries/kotlin.test/js/build.gradle | 3 +- libraries/kotlin.test/js/it/build.gradle | 4 +- libraries/kotlin.test/junit/build.gradle | 4 +- libraries/kotlin.test/junit5/build.gradle | 6 +- libraries/kotlin.test/jvm/build.gradle | 6 +- libraries/kotlin.test/testng/build.gradle | 4 +- libraries/kotlinx-metadata/build.gradle.kts | 2 +- .../kotlinx-metadata/jvm/build.gradle.kts | 2 +- .../kotlinx-metadata/klib/build.gradle.kts | 4 +- libraries/reflect/api/build.gradle | 3 +- libraries/reflect/build.gradle.kts | 9 +- libraries/scripting/common/build.gradle.kts | 4 +- .../scripting/dependencies/build.gradle.kts | 6 +- libraries/scripting/intellij/build.gradle.kts | 6 +- libraries/scripting/js-test/build.gradle.kts | 18 ++-- libraries/scripting/js/build.gradle.kts | 2 +- .../scripting/jsr223-test/build.gradle.kts | 2 +- libraries/scripting/jsr223/build.gradle.kts | 12 +-- .../scripting/jvm-host-test/build.gradle.kts | 12 +-- libraries/scripting/jvm-host/build.gradle.kts | 8 +- libraries/scripting/jvm/build.gradle.kts | 8 +- libraries/stdlib/common/build.gradle | 4 +- libraries/stdlib/jdk7/build.gradle | 6 +- libraries/stdlib/jdk8/build.gradle | 6 +- libraries/stdlib/js-v1/build.gradle | 3 +- .../jvm-minimal-for-test/build.gradle.kts | 5 - libraries/stdlib/jvm/build.gradle | 5 +- libraries/stdlib/samples/build.gradle | 4 +- .../build.gradle | 4 +- .../build.gradle.kts | 6 +- .../build.gradle.kts | 6 +- .../kotlin-gradle-plugin/build.gradle.kts | 2 +- .../kotlin-main-kts-test/build.gradle.kts | 10 +- .../tools/kotlin-main-kts/build.gradle.kts | 5 +- libraries/tools/kotlin-noarg/build.gradle | 4 +- .../kotlin-sam-with-receiver/build.gradle | 4 +- .../tools/kotlin-script-util/build.gradle.kts | 28 +++--- .../tools/kotlin-serialization/build.gradle | 2 +- .../tools/kotlin-stdlib-gen/build.gradle | 4 +- libraries/tools/script-runtime/build.gradle | 8 -- native/frontend/build.gradle.kts | 2 +- plugins/allopen/allopen-cli/build.gradle.kts | 8 +- .../build.gradle.kts | 24 ++--- .../android-extensions-idea/build.gradle.kts | 28 +++--- .../build.gradle.kts | 2 +- .../fir/fir-plugin-prototype/build.gradle.kts | 28 +++--- plugins/imports-dumper/build.gradle.kts | 6 +- plugins/jvm-abi-gen/build.gradle.kts | 3 +- plugins/kapt3/kapt3-base/build.gradle.kts | 4 +- plugins/kapt3/kapt3-cli/build.gradle.kts | 8 +- plugins/kapt3/kapt3-compiler/build.gradle.kts | 26 ++--- plugins/kapt3/kapt3-runtime/build.gradle.kts | 2 +- .../build.gradle.kts | 4 +- plugins/noarg/noarg-cli/build.gradle.kts | 10 +- .../parcelize-compiler/build.gradle.kts | 24 ++--- .../parcelize/parcelize-ide/build.gradle.kts | 4 +- .../parcelize-runtime/build.gradle.kts | 4 +- .../pill/generate-all-tests/build.gradle.kts | 2 +- .../sam-with-receiver-cli/build.gradle.kts | 10 +- .../scripting-compiler-impl/build.gradle.kts | 22 ++--- .../scripting-compiler/build.gradle.kts | 30 +++--- .../build.gradle.kts | 22 +++-- .../scripting-ide-services/build.gradle.kts | 8 +- .../build.gradle.kts | 14 +-- prepare/compiler-embeddable/build.gradle.kts | 4 +- prepare/compiler/build.gradle.kts | 14 +-- test-instrumenter/build.gradle.kts | 2 +- 158 files changed, 867 insertions(+), 884 deletions(-) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index f5b95eb1db4..04a343b1451 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -5,29 +5,29 @@ plugins { } dependencies { - compile(project(":compiler:psi")) - compile(project(":compiler:fir:fir2ir")) - compile(project(":compiler:ir.tree")) - compile(project(":compiler:fir:resolve")) - compile(project(":compiler:fir:checkers")) - compile(project(":compiler:fir:checkers:checkers.jvm")) - compile(project(":compiler:fir:java")) - compile(project(":analysis:low-level-api-fir")) - compile(project(":analysis:analysis-api")) - compile(project(":compiler:light-classes")) - compile(intellijCoreDep()) + api(project(":compiler:psi")) + api(project(":compiler:fir:fir2ir")) + api(project(":compiler:ir.tree")) + api(project(":compiler:fir:resolve")) + api(project(":compiler:fir:checkers")) + api(project(":compiler:fir:checkers:checkers.jvm")) + api(project(":compiler:fir:java")) + api(project(":analysis:low-level-api-fir")) + api(project(":analysis:analysis-api")) + api(project(":compiler:light-classes")) + api(intellijCoreDep()) implementation(project(":analysis:analysis-api-providers")) - testCompile(projectTests(":analysis:low-level-api-fir")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:test-infrastructure-utils")) - testCompile(projectTests(":compiler:test-infrastructure")) - testCompile(projectTests(":compiler:tests-common-new")) - testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(toolsJar()) + testApi(projectTests(":analysis:low-level-api-fir")) + testApi(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(project(":kotlin-test:kotlin-test-junit")) + testApi(toolsJar()) testApiJUnit5() - testRuntime(project(":analysis:symbol-light-classes")) + testRuntimeOnly(project(":analysis:symbol-light-classes")) testRuntimeOnly(intellijDep()) { includeJars( diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index a566a868ad3..294cd30312f 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/analysis/analysis-api/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compileOnly(project(":analysis:low-level-api-fir")) implementation(project(":analysis:analysis-api-providers")) - compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } } kotlin { diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts index 9156eebf76d..87d8cfc4f50 100644 --- a/analysis/low-level-api-fir/build.gradle.kts +++ b/analysis/low-level-api-fir/build.gradle.kts @@ -4,35 +4,35 @@ plugins { } dependencies { - compile(project(":compiler:psi")) + api(project(":compiler:psi")) implementation(project(":analysis:project-structure")) - compile(project(":compiler:fir:fir2ir")) - compile(project(":compiler:fir:fir2ir:jvm-backend")) - compile(project(":compiler:ir.serialization.common")) - compile(project(":compiler:fir:resolve")) - compile(project(":compiler:fir:checkers")) - compile(project(":compiler:fir:checkers:checkers.jvm")) - compile(project(":compiler:fir:java")) - compile(project(":compiler:backend.common.jvm")) - testCompile(project(":analysis:analysis-api-fir")) + api(project(":compiler:fir:fir2ir")) + api(project(":compiler:fir:fir2ir:jvm-backend")) + api(project(":compiler:ir.serialization.common")) + api(project(":compiler:fir:resolve")) + api(project(":compiler:fir:checkers")) + api(project(":compiler:fir:checkers:checkers.jvm")) + api(project(":compiler:fir:java")) + api(project(":compiler:backend.common.jvm")) + testApi(project(":analysis:analysis-api-fir")) implementation(project(":compiler:ir.psi2ir")) implementation(project(":compiler:fir:entrypoint")) implementation(project(":analysis:analysis-api-providers")) - compile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + api(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - testCompile(projectTests(":compiler:test-infrastructure-utils")) - testCompile(projectTests(":compiler:test-infrastructure")) - testCompile(projectTests(":compiler:tests-common-new")) + testApi(projectTests(":compiler:test-infrastructure-utils")) + testApi(projectTests(":compiler:test-infrastructure")) + testApi(projectTests(":compiler:tests-common-new")) testImplementation("org.opentest4j:opentest4j:1.2.0") - testCompile(toolsJar()) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testCompile(project(":kotlin-test:kotlin-test-junit")) + testApi(toolsJar()) + testApi(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) + testApi(project(":kotlin-test:kotlin-test-junit")) testApiJUnit5() - testCompile(project(":kotlin-reflect")) + testApi(project(":kotlin-reflect")) testImplementation(project(":analysis:symbol-light-classes")) testRuntimeOnly(intellijDep()) { diff --git a/ant/build.gradle.kts b/ant/build.gradle.kts index de9db4222be..fa992f51094 100644 --- a/ant/build.gradle.kts +++ b/ant/build.gradle.kts @@ -6,9 +6,9 @@ plugins { } dependencies { - compile(commonDep("org.apache.ant", "ant")) - compile(project(":kotlin-preloader")) - compile(kotlinStdlib()) + api(commonDep("org.apache.ant", "ant")) + api(project(":kotlin-preloader")) + api(kotlinStdlib()) } sourceSets { diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 5bf280a411f..b68a38286c4 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -9,15 +9,15 @@ plugins { } dependencies { - compile(kotlinStdlib()) - compile(project(":compiler:frontend")) - compile(projectTests(":compiler:tests-common")) - compile(project(":compiler:cli")) - compile(intellijCoreDep()) { includeJars("intellij-core") } - compile(jpsStandalone()) { includeJars("jps-model") } - compile(intellijPluginDep("java")) - compile(intellijDep()) { includeIntellijCoreJarDependencies(project) } - compile("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version") + api(kotlinStdlib()) + api(project(":compiler:frontend")) + api(projectTests(":compiler:tests-common")) + api(project(":compiler:cli")) + api(intellijCoreDep()) { includeJars("intellij-core") } + api(jpsStandalone()) { includeJars("jps-model") } + api(intellijPluginDep("java")) + api(intellijDep()) { includeIntellijCoreJarDependencies(project) } + api("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version") } sourceSets { diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index e924be80bdc..372b4f87d42 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { compileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":compiler:cli-common")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) - testCompile(protobufFull()) - testCompile(kotlinStdlib()) - testRuntime(project(":kotlin-reflect")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) + testApi(protobufFull()) + testApi(kotlinStdlib()) + testImplementation(project(":kotlin-reflect")) } sourceSets { diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index f1e68cc57da..7f22d950757 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -33,7 +33,7 @@ import plugins.mainPublicationName private const val MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME = "testJar" fun Project.testsJar(body: Jar.() -> Unit = {}): Jar { - val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testCompile"]) + val testsJarCfg = configurations.getOrCreate("tests-jar").extendsFrom(configurations["testApi"]) return task(MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME) { dependsOn("testClasses") diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index 2176e3aab25..565c636af73 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -142,14 +142,14 @@ fun DependencyHandler.jpsLikeJarDependency( JpsDepScope.COMPILE -> { if (exported) { add("api", dependencyNotation, dependencyConfiguration) - add("testCompile", dependencyNotation, dependencyConfiguration) + add("testApi", dependencyNotation, dependencyConfiguration) } else { add("implementation", dependencyNotation, dependencyConfiguration) } } JpsDepScope.TEST -> { if (exported) { - add("testCompile", dependencyNotation, dependencyConfiguration) + add("testApi", dependencyNotation, dependencyConfiguration) } else { add("testImplementation", dependencyNotation, dependencyConfiguration) } @@ -160,7 +160,7 @@ fun DependencyHandler.jpsLikeJarDependency( JpsDepScope.PROVIDED -> { if (exported) { add("compileOnlyApi", dependencyNotation, dependencyConfiguration) - add("testCompile", dependencyNotation, dependencyConfiguration) + add("testApi", dependencyNotation, dependencyConfiguration) } else { add("compileOnly", dependencyNotation, dependencyConfiguration) add("testImplementation", dependencyNotation, dependencyConfiguration) diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index dd2bcf1e01e..0d4b0c28ac4 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/buildSrc/src/main/kotlin/instrument.kt @@ -140,7 +140,7 @@ abstract class IntelliJInstrumentCodeTask : ConventionTask() { // Instrumentation needs to have access to sources of forms for inclusion private val depSourceDirectorySets by lazy { - project.configurations["compile"].dependencies.withType(ProjectDependency::class.java) + project.configurations["api"].dependencies.withType(ProjectDependency::class.java) .map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories } } diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 407a9b4dd7d..20f5ccba45d 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -6,37 +6,37 @@ plugins { } dependencies { - testCompile(project(":core:descriptors")) - testCompile(project(":core:descriptors.jvm")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:incremental-compilation-impl")) - testCompile(project(":compiler:frontend.java")) + testApi(project(":core:descriptors")) + testApi(project(":core:descriptors.jvm")) + testApi(project(":compiler:util")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:frontend")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:incremental-compilation-impl")) + testApi(project(":compiler:frontend.java")) - testCompile(kotlinStdlib()) - testCompile(project(":kotlin-reflect")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(kotlinStdlib()) + testApi(project(":kotlin-reflect")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-compiler-utils")) testApi(projectTests(":compiler:tests-common-new")) - testCompile(commonDep("junit:junit")) + testApi(commonDep("junit:junit")) - testCompile(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) } - testCompile(intellijDep()) { includeJars("groovy", rootProject = rootProject) } + testApi(intellijDep()) { includeJars("util", "idea", "idea_rt", rootProject = rootProject) } + testApi(intellijDep()) { includeJars("groovy", rootProject = rootProject) } - testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } - testCompile(jpsStandalone()) { includeJars("jps-model") } - testCompile(jpsBuildTest()) + testApi(intellijPluginDep("java")) { includeJars("jps-builders") } + testApi(jpsStandalone()) { includeJars("jps-model") } + testApi(jpsBuildTest()) - testRuntimeOnly(compile(intellijCoreDep()) { includeJars("intellij-core") }) - testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) }) + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) } - testCompile("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}") + testApi("org.junit.platform:junit-platform-launcher:${commonVer("org.junit.platform", "")}") } sourceSets { diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts index 9b2ef50e127..5e53698b5d8 100644 --- a/compiler/backend-common/build.gradle.kts +++ b/compiler/backend-common/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - compile(project(":core:descriptors")) - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) + api(project(":core:descriptors")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index 4199ae4d030..6a02463ee7c 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -4,12 +4,12 @@ plugins { } dependencies { - compile(project(":kotlin-annotations-jvm")) - compile(project(":compiler:util")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:serialization")) + api(project(":kotlin-annotations-jvm")) + api(project(":compiler:util")) + api(project(":compiler:backend-common")) + api(project(":compiler:frontend")) + api(project(":compiler:frontend.java")) + api(project(":compiler:serialization")) api(project(":compiler:backend.common.jvm")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 18ad2e7f9b9..9e7eed1c8a9 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -12,26 +12,26 @@ val otherCompilerModules = compilerModules.filter { it != path } val antLauncherJar by configurations.creating dependencies { - testRuntime(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests + testImplementation(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests - testCompile(project(":kotlin-script-runtime")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) + testApi(project(":kotlin-script-runtime")) + testApi(project(":kotlin-test:kotlin-test-jvm")) - testCompile(kotlinStdlib()) + testApi(kotlinStdlib()) - testCompile(commonDep("junit:junit")) + testApi(commonDep("junit:junit")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:fir:raw-fir:psi2fir")) - testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir")) - testCompile(projectTests(":compiler:fir:fir2ir")) - testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testCompile(projectTests(":generators:test-generator")) - testCompile(project(":compiler:ir.ir2cfg")) - testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":kotlin-script-util")) + testApi(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler:fir:raw-fir:psi2fir")) + testApi(projectTests(":compiler:fir:raw-fir:light-tree2fir")) + testApi(projectTests(":compiler:fir:fir2ir")) + testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) + testApi(projectTests(":generators:test-generator")) + testApi(project(":compiler:ir.ir2cfg")) + testApi(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":kotlin-script-util")) testCompileOnly(project(":kotlin-reflect-api")) otherCompilerModules.forEach { testCompileOnly(project(it)) @@ -41,8 +41,8 @@ dependencies { testRuntimeOnly(intellijPluginDep("java")) - testRuntime(project(":kotlin-reflect")) - testRuntime(toolsJar()) + testImplementation(project(":kotlin-reflect")) + testImplementation(toolsJar()) antLauncherJar(commonDep("org.apache.ant", "ant")) antLauncherJar(toolsJar()) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 42e5058f69a..202b1021bbc 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -4,35 +4,35 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend:cfg")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:backend")) - compile(project(":compiler:backend.jvm")) + api(project(":compiler:util")) + api(project(":compiler:cli-common")) + api(project(":compiler:frontend")) + api(project(":compiler:frontend.java")) + api(project(":compiler:frontend:cfg")) + api(project(":compiler:backend-common")) + api(project(":compiler:backend")) + api(project(":compiler:backend.jvm")) implementation(project(":compiler:backend.jvm.lower")) implementation(project(":compiler:backend.jvm.entrypoint")) - compile(project(":compiler:ir.backend.common")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:serialization")) - compile(project(":compiler:plugin-api")) - compile(project(":compiler:javac-wrapper")) - compile(project(":js:js.translator")) - compile(project(":native:frontend.native")) - compile(commonDep("org.fusesource.jansi", "jansi")) - compile(commonDep("org.jline", "jline")) - compile(project(":compiler:fir:raw-fir:psi2fir")) - compile(project(":compiler:fir:resolve")) - compile(project(":compiler:fir:java")) + api(project(":compiler:ir.backend.common")) + api(project(":compiler:light-classes")) + api(project(":compiler:serialization")) + api(project(":compiler:plugin-api")) + api(project(":compiler:javac-wrapper")) + api(project(":js:js.translator")) + api(project(":native:frontend.native")) + api(commonDep("org.fusesource.jansi", "jansi")) + api(commonDep("org.jline", "jline")) + api(project(":compiler:fir:raw-fir:psi2fir")) + api(project(":compiler:fir:resolve")) + api(project(":compiler:fir:java")) implementation(project(":compiler:fir:entrypoint")) - compile(project(":compiler:fir:fir2ir")) - compile(project(":compiler:fir:fir2ir:jvm-backend")) - compile(project(":compiler:fir:checkers")) - compile(project(":compiler:fir:checkers:checkers.jvm")) - compile(project(":kotlin-util-klib")) - compile(project(":kotlin-util-io")) + api(project(":compiler:fir:fir2ir")) + api(project(":compiler:fir:fir2ir:jvm-backend")) + api(project(":compiler:fir:checkers")) + api(project(":compiler:fir:checkers:checkers.jvm")) + api(project(":kotlin-util-klib")) + api(project(":kotlin-util-io")) // TODO: as soon as cli-jvm is extracted out of this module, move this dependency there compileOnly(project(":compiler:ir.tree.impl")) @@ -41,10 +41,10 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:cli")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:cli")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) } sourceSets { diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 5d800dd82e3..24af8d482fc 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } dependencies { - compile(project(":core:util.runtime")) - compile(project(":compiler:config")) - compile(project(":compiler:config.jvm")) - compile(project(":js:js.config")) - compile(project(":native:kotlin-native-utils")) + api(project(":core:util.runtime")) + api(project(":compiler:config")) + api(project(":compiler:config.jvm")) + api(project(":js:js.config")) + api(project(":native:kotlin-native-utils")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } diff --git a/compiler/cli/cli-js/build.gradle.kts b/compiler/cli/cli-js/build.gradle.kts index 29bbfbecbeb..373cdbed9f9 100644 --- a/compiler/cli/cli-js/build.gradle.kts +++ b/compiler/cli/cli-js/build.gradle.kts @@ -4,20 +4,20 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:cli")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:ir.backend.common")) - compile(project(":compiler:ir.serialization.js")) - compile(project(":compiler:ir.tree.impl")) - compile(project(":compiler:backend.js")) - compile(project(":compiler:backend.wasm")) - compile(project(":js:js.translator")) - compile(project(":js:js.serializer")) - compile(project(":js:js.dce")) - compile(project(":js:js.sourcemap")) + api(project(":compiler:util")) + api(project(":compiler:cli-common")) + api(project(":compiler:cli")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":compiler:ir.backend.common")) + api(project(":compiler:ir.serialization.js")) + api(project(":compiler:ir.tree.impl")) + api(project(":compiler:backend.js")) + api(project(":compiler:backend.wasm")) + api(project(":js:js.translator")) + api(project(":js:js.serializer")) + api(project(":js:js.dce")) + api(project(":js:js.sourcemap")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts index e5a8efca769..9ef061a943d 100644 --- a/compiler/cli/cli-runner/build.gradle.kts +++ b/compiler/cli/cli-runner/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) } sourceSets { diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index 2c2c59cdc9d..6ea4f958d1b 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -6,17 +6,17 @@ plugins { } dependencies { - compile(project(":kotlin-build-common")) + api(project(":kotlin-build-common")) compileOnly(project(":compiler:cli-common")) compileOnly(project(":kotlin-preloader")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":daemon-common")) compileOnly(project(":daemon-common-new")) - compile(projectRuntimeJar(":kotlin-daemon-client")) + api(projectRuntimeJar(":kotlin-daemon-client")) compileOnly(project(":compiler:util")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } sourceSets { diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts index a7d00508bb0..954dbc51ddb 100644 --- a/compiler/container/build.gradle.kts +++ b/compiler/container/build.gradle.kts @@ -4,17 +4,17 @@ plugins { } dependencies { - compile(project(":core:util.runtime")) - compile(commonDep("javax.inject")) + api(project(":core:util.runtime")) + api(commonDep("javax.inject")) compileOnly(kotlinStdlib()) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(kotlinStdlib()) + testApi(kotlinStdlib()) testCompileOnly("org.jetbrains:annotations:13.0") - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(project(":kotlin-test:kotlin-test-junit")) + testApi(commonDep("junit:junit")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntime(intellijDep()) { includeJars("trove4j", "util") } + testRuntimeOnly(intellijDep()) { includeJars("trove4j", "util") } } sourceSets { diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 888d876e356..68b8e96f388 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -8,8 +8,8 @@ plugins { val ktorExcludesForDaemon : List> by rootProject.extra dependencies { - compile(commonDep("org.fusesource.jansi", "jansi")) - compile(commonDep("org.jline", "jline")) + api(commonDep("org.fusesource.jansi", "jansi")) + api(commonDep("org.jline", "jline")) compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:cli-js")) diff --git a/compiler/daemon/daemon-client-new/build.gradle.kts b/compiler/daemon/daemon-client-new/build.gradle.kts index 925e86df4c4..23eb2c5d6dd 100644 --- a/compiler/daemon/daemon-client-new/build.gradle.kts +++ b/compiler/daemon/daemon-client-new/build.gradle.kts @@ -37,10 +37,10 @@ dependencies { nativePlatformVariants.forEach { embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it")) } - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - compile(commonDep("io.ktor", "ktor-network")) { + api(commonDep("io.ktor", "ktor-network")) { ktorExcludesForDaemon.forEach { (group, module) -> exclude(group = group, module = module) } diff --git a/compiler/daemon/daemon-common-new/build.gradle.kts b/compiler/daemon/daemon-common-new/build.gradle.kts index f2ba04d0cd2..48c65281cca 100644 --- a/compiler/daemon/daemon-common-new/build.gradle.kts +++ b/compiler/daemon/daemon-common-new/build.gradle.kts @@ -8,13 +8,13 @@ val ktorExcludesForDaemon: List> by rootProject.extra dependencies { compileOnly(project(":daemon-common")) - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - compile(commonDep("io.ktor", "ktor-network")) { + api(commonDep("io.ktor", "ktor-network")) { ktorExcludesForDaemon.forEach { (group, module) -> exclude(group = group, module = module) } diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts index 6471dc723c7..39c701f5379 100644 --- a/compiler/daemon/daemon-common/build.gradle.kts +++ b/compiler/daemon/daemon-common/build.gradle.kts @@ -4,13 +4,13 @@ plugins { } dependencies { - compile(project(":compiler:cli-common")) - compile(project(":kotlin-build-common")) - compile(kotlinStdlib()) + api(project(":compiler:cli-common")) + api(project(":kotlin-build-common")) + api(kotlinStdlib()) compileOnly(project(":js:js.config")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } diff --git a/compiler/daemon/daemon-tests/build.gradle.kts b/compiler/daemon/daemon-tests/build.gradle.kts index d95fcd25dcb..b6b551071d0 100644 --- a/compiler/daemon/daemon-tests/build.gradle.kts +++ b/compiler/daemon/daemon-tests/build.gradle.kts @@ -9,23 +9,23 @@ plugins { val ktorExcludesForDaemon: List> by rootProject.extra dependencies { - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(kotlinStdlib()) - testCompile(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(kotlinStdlib()) + testApi(commonDep("junit:junit")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) - testCompile(projectRuntimeJar(":kotlin-daemon-client")) - testCompile(projectRuntimeJar(":kotlin-daemon-client-new")) + testApi(projectRuntimeJar(":kotlin-daemon-client")) + testApi(projectRuntimeJar(":kotlin-daemon-client-new")) testCompileOnly(project(":kotlin-daemon")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - testCompile(commonDep("io.ktor", "ktor-network")) { + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + testApi(commonDep("io.ktor", "ktor-network")) { ktorExcludesForDaemon.forEach { (group, module) -> exclude(group = group, module = module) } } - testRuntime(project(":kotlin-daemon")) - testRuntime(intellijCoreDep()) { includeJars("intellij-core") } + testImplementation(project(":kotlin-daemon")) + testImplementation(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index b44fd7cd956..7839f8fe0bd 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -122,5 +122,5 @@ val jmhExec by tasks.registering(JavaExec::class) { workingDir = rootDir systemProperty("idea.home.path", project.intellijRootDir().absolutePath) systemProperty("idea.max.intellisense.filesize", 5000 * 1024) - configurations.plusAssign(project.configurations["compile"]) + configurations.plusAssign(project.configurations["api"]) } diff --git a/compiler/frontend.common/build.gradle.kts b/compiler/frontend.common/build.gradle.kts index d8cf6952bd5..7c08e8187e6 100644 --- a/compiler/frontend.common/build.gradle.kts +++ b/compiler/frontend.common/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - compile(project(":compiler:config")) - compile(project(":compiler:container")) + api(project(":compiler:config")) + api(project(":compiler:container")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index b000bc4e8d1..128a0939a08 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -4,12 +4,12 @@ plugins { } dependencies { - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:util")) - compile(project(":compiler:config.jvm")) - compile("javax.annotation:jsr250-api:1.0") - compile(project(":compiler:frontend")) + api(project(":core:descriptors")) + api(project(":core:descriptors.jvm")) + api(project(":compiler:util")) + api(project(":compiler:config.jvm")) + api("javax.annotation:jsr250-api:1.0") + api(project(":compiler:frontend")) api(project(":compiler:resolution.common.jvm")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index df050b2b238..f05e981de13 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -4,18 +4,18 @@ plugins { } dependencies { - compile(project(":kotlin-annotations-jvm")) - compile(project(":core:descriptors")) - compile(project(":core:deserialization")) - compile(project(":compiler:util")) - compile(project(":compiler:config")) - compile(project(":compiler:container")) - compile(project(":compiler:resolution")) - compile(project(":compiler:psi")) - compile(project(":compiler:frontend.common")) - compile(project(":compiler:frontend.common-psi")) - compile(project(":kotlin-script-runtime")) - compile(commonDep("io.javaslang","javaslang")) + api(project(":kotlin-annotations-jvm")) + api(project(":core:descriptors")) + api(project(":core:deserialization")) + api(project(":compiler:util")) + api(project(":compiler:config")) + api(project(":compiler:container")) + api(project(":compiler:resolution")) + api(project(":compiler:psi")) + api(project(":compiler:frontend.common")) + api(project(":compiler:frontend.common-psi")) + api(project(":kotlin-script-runtime")) + api(commonDep("io.javaslang","javaslang")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) } } diff --git a/compiler/frontend/cfg/build.gradle.kts b/compiler/frontend/cfg/build.gradle.kts index e76386cf74b..057948d1db8 100644 --- a/compiler/frontend/cfg/build.gradle.kts +++ b/compiler/frontend/cfg/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":compiler:frontend")) + api(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } } diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index 1b32bd34e76..9eaa1e087ee 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -5,28 +5,28 @@ plugins { } dependencies { - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":core:deserialization")) - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:cli")) - compile(project(":compiler:cli-js")) - compile(project(":kotlin-build-common")) - compile(project(":daemon-common")) + api(project(":core:descriptors")) + api(project(":core:descriptors.jvm")) + api(project(":core:deserialization")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:frontend.java")) + api(project(":compiler:cli")) + api(project(":compiler:cli-js")) + api(project(":kotlin-build-common")) + api(project(":daemon-common")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(kotlinStdlib()) - testCompile(projectTests(":kotlin-build-common")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(intellijDep()) { includeJars("log4j", "jdom") } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":core:descriptors.runtime")) - testRuntime(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) } + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-junit")) + testApi(kotlinStdlib()) + testApi(projectTests(":kotlin-build-common")) + testApi(projectTests(":compiler:tests-common")) + testApi(intellijCoreDep()) { includeJars("intellij-core") } + testApi(intellijDep()) { includeJars("log4j", "jdom") } + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) + testRuntimeOnly(intellijDep()) { includeJars("lz4-java", "jna", rootProject = rootProject) } } sourceSets { diff --git a/compiler/ir/backend.common/build.gradle.kts b/compiler/ir/backend.common/build.gradle.kts index 6c1ddf28eff..75193ae6106 100644 --- a/compiler/ir/backend.common/build.gradle.kts +++ b/compiler/ir/backend.common/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:ir.tree")) - compile(project(":compiler:ir.interpreter")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":compiler:ir.tree")) + api(project(":compiler:ir.interpreter")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/ir/backend.js/build.gradle.kts b/compiler/ir/backend.js/build.gradle.kts index 7c65f34e3f5..8c3dc57144c 100644 --- a/compiler/ir/backend.js/build.gradle.kts +++ b/compiler/ir/backend.js/build.gradle.kts @@ -4,17 +4,17 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:ir.tree")) - compile(project(":compiler:ir.backend.common")) - compile(project(":compiler:ir.serialization.common")) - compile(project(":compiler:ir.serialization.js")) - compile(project(":compiler:ir.tree.persistent")) - compile(project(":js:js.ast")) - compile(project(":js:js.frontend")) - compile(project(":js:js.sourcemap")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":compiler:ir.tree")) + api(project(":compiler:ir.backend.common")) + api(project(":compiler:ir.serialization.common")) + api(project(":compiler:ir.serialization.js")) + api(project(":compiler:ir.tree.persistent")) + api(project(":js:js.ast")) + api(project(":js:js.frontend")) + api(project(":js:js.sourcemap")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts index 1dfcd114ca3..e2337406268 100644 --- a/compiler/ir/backend.jvm/build.gradle.kts +++ b/compiler/ir/backend.jvm/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - compile(project(":kotlin-annotations-jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:ir.tree")) - compile(project(":compiler:ir.backend.common")) + api(project(":kotlin-annotations-jvm")) + api(project(":compiler:backend")) + api(project(":compiler:ir.tree")) + api(project(":compiler:ir.backend.common")) api(project(":compiler:backend.common.jvm")) compileOnly(project(":compiler:ir.tree.impl")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) } diff --git a/compiler/ir/backend.wasm/build.gradle.kts b/compiler/ir/backend.wasm/build.gradle.kts index 0757e095a22..e4ad446c6ca 100644 --- a/compiler/ir/backend.wasm/build.gradle.kts +++ b/compiler/ir/backend.wasm/build.gradle.kts @@ -4,17 +4,17 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:ir.tree")) - compile(project(":compiler:ir.backend.common")) - compile(project(":compiler:ir.serialization.common")) - compile(project(":compiler:ir.serialization.js")) - compile(project(":js:js.ast")) - compile(project(":js:js.frontend")) - compile(project(":compiler:backend.js")) - compile(project(":wasm:wasm.ir")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":compiler:ir.tree")) + api(project(":compiler:ir.backend.common")) + api(project(":compiler:ir.serialization.common")) + api(project(":compiler:ir.serialization.js")) + api(project(":js:js.ast")) + api(project(":js:js.frontend")) + api(project(":compiler:backend.js")) + api(project(":wasm:wasm.ir")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/ir/ir.ir2cfg/build.gradle.kts b/compiler/ir/ir.ir2cfg/build.gradle.kts index 8f0b8b59e29..2f2f4b089fa 100644 --- a/compiler/ir/ir.ir2cfg/build.gradle.kts +++ b/compiler/ir/ir.ir2cfg/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:ir.tree")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:ir.tree")) } sourceSets { diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts index a177469ed51..7dbbd4b4616 100644 --- a/compiler/ir/ir.psi2ir/build.gradle.kts +++ b/compiler/ir/ir.psi2ir/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":compiler:ir.tree")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":compiler:ir.tree")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/ir/ir.tree.impl/build.gradle.kts b/compiler/ir/ir.tree.impl/build.gradle.kts index 4cbba1949df..eca4a19103d 100644 --- a/compiler/ir/ir.tree.impl/build.gradle.kts +++ b/compiler/ir/ir.tree.impl/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":compiler:ir.tree")) + api(project(":compiler:ir.tree")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index 6a7fc7aafc8..1ff32ccad90 100644 --- a/compiler/ir/serialization.common/build.gradle.kts +++ b/compiler/ir/serialization.common/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } dependencies { - compile(project(":compiler:ir.tree")) - compile(project(":compiler:serialization")) - compile(project(":kotlin-util-klib")) - compile(project(":kotlin-util-klib-metadata")) - compile(project(":compiler:util")) + api(project(":compiler:ir.tree")) + api(project(":compiler:serialization")) + api(project(":kotlin-util-klib")) + api(project(":kotlin-util-klib-metadata")) + api(project(":compiler:util")) implementation(project(":compiler:psi")) compileOnly(project(":kotlin-reflect-api")) diff --git a/compiler/ir/serialization.js/build.gradle.kts b/compiler/ir/serialization.js/build.gradle.kts index 936cf777359..547ea13e0a8 100644 --- a/compiler/ir/serialization.js/build.gradle.kts +++ b/compiler/ir/serialization.js/build.gradle.kts @@ -7,8 +7,9 @@ dependencies { api(project(":compiler:ir.psi2ir")) api(project(":compiler:ir.serialization.common")) api(project(":js:js.frontend")) + api(project(":compiler:ir.tree.persistent")) + implementation(project(":compiler:ir.backend.common")) - compile(project(":compiler:ir.tree.persistent")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/ir/serialization.jvm/build.gradle.kts b/compiler/ir/serialization.jvm/build.gradle.kts index 7d14e753cd3..c2b23e761fa 100644 --- a/compiler/ir/serialization.jvm/build.gradle.kts +++ b/compiler/ir/serialization.jvm/build.gradle.kts @@ -4,12 +4,12 @@ plugins { } dependencies { - compile(project(":compiler:ir.tree")) - compile(project(":compiler:ir.serialization.common")) - compile(project(":core:descriptors.jvm")) - compile(project(":core:metadata.jvm")) + api(project(":compiler:ir.tree")) + api(project(":compiler:ir.serialization.common")) + api(project(":core:descriptors.jvm")) + api(project(":core:metadata.jvm")) implementation(project(":core:deserialization.common.jvm")) - compile(project(":compiler:frontend.java")) + api(project(":compiler:frontend.java")) } sourceSets { diff --git a/compiler/javac-wrapper/build.gradle.kts b/compiler/javac-wrapper/build.gradle.kts index 930a58a83e5..b65734d50bf 100644 --- a/compiler/javac-wrapper/build.gradle.kts +++ b/compiler/javac-wrapper/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend.java")) + api(project(":compiler:util")) + api(project(":compiler:frontend.java")) compileOnly(toolsJarApi()) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 29a726a1ceb..43c58289967 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -5,10 +5,10 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:backend")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) + api(project(":compiler:util")) + api(project(":compiler:backend")) + api(project(":compiler:frontend")) + api(project(":compiler:frontend.java")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") } diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts index ef1c1c5232f..b9f2a6b273b 100644 --- a/compiler/plugin-api/build.gradle.kts +++ b/compiler/plugin-api/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts index 3c6f8fbb9d9..6d7009db9dd 100644 --- a/compiler/psi/build.gradle.kts +++ b/compiler/psi/build.gradle.kts @@ -10,13 +10,10 @@ repositories { val jflexPath by configurations.creating dependencies { - val compile by configurations - val compileOnly by configurations - - compile(project(":core:compiler.common")) - compile(project(":compiler:util")) - compile(project(":compiler:frontend.common")) - compile(project(":kotlin-script-runtime")) + api(project(":core:compiler.common")) + api(project(":compiler:util")) + api(project(":compiler:frontend.common")) + api(project(":kotlin-script-runtime")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) } diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts index 6048a611681..df184256657 100644 --- a/compiler/resolution/build.gradle.kts +++ b/compiler/resolution/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":core:descriptors")) + api(project(":compiler:util")) + api(project(":core:descriptors")) api(project(":compiler:resolution.common")) compileOnly(intellijDep()) { includeJars("trove4j") } } diff --git a/compiler/serialization/build.gradle.kts b/compiler/serialization/build.gradle.kts index 280b9d00fdb..8430a971cd9 100644 --- a/compiler/serialization/build.gradle.kts +++ b/compiler/serialization/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - compile(project(":compiler:resolution")) - compile(project(":core:deserialization")) + api(project(":compiler:resolution")) + api(project(":core:deserialization")) api(project(":compiler:util")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) } diff --git a/compiler/tests-against-klib/build.gradle.kts b/compiler/tests-against-klib/build.gradle.kts index 61aad1a4e84..2f92bf27781 100644 --- a/compiler/tests-against-klib/build.gradle.kts +++ b/compiler/tests-against-klib/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } dependencies { - compile(kotlinStdlib()) - testCompile(projectTests(":generators:test-generator")) + api(kotlinStdlib()) + testApi(projectTests(":generators:test-generator")) testApi(projectTests(":compiler:tests-common")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/tests-common-jvm6/build.gradle.kts b/compiler/tests-common-jvm6/build.gradle.kts index 6e9c9b53d1f..a52c4b35c61 100644 --- a/compiler/tests-common-jvm6/build.gradle.kts +++ b/compiler/tests-common-jvm6/build.gradle.kts @@ -6,8 +6,8 @@ plugins { project.updateJvmTarget("1.6") dependencies { - compile(kotlinStdlib()) - testCompile(project(":kotlin-test:kotlin-test-jvm")) + api(kotlinStdlib()) + testApi(project(":kotlin-test:kotlin-test-jvm")) } sourceSets { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 7a023a9a0bf..044de56f3e1 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -5,59 +5,59 @@ plugins { } dependencies { - testCompile(kotlinStdlib("jdk8")) - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":core:descriptors")) - testCompile(project(":core:descriptors.jvm")) - testCompile(project(":core:deserialization")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:tests-mutes")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:ir.tree.impl")) - testCompile(project(":compiler:fir:tree")) - testCompile(project(":compiler:fir:raw-fir:psi2fir")) - testCompile(project(":compiler:fir:raw-fir:light-tree2fir")) - testCompile(project(":compiler:fir:fir2ir")) - testCompile(project(":compiler:fir:fir2ir:jvm-backend")) - testCompile(project(":compiler:fir:fir-serialization")) - testCompile(project(":compiler:fir:fir-deserialization")) - testCompile(project(":compiler:fir:cones")) - testCompile(project(":compiler:fir:resolve")) - testCompile(project(":compiler:fir:checkers")) - testCompile(project(":compiler:fir:checkers:checkers.jvm")) - testCompile(project(":compiler:fir:java")) - testCompile(project(":compiler:fir:entrypoint")) - testCompile(project(":compiler:ir.ir2cfg")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.java")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:cli-js")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":compiler:serialization")) - testCompile(project(":kotlin-preloader")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":daemon-common")) - testCompile(project(":daemon-common-new")) - testCompile(project(":js:js.serializer")) - testCompile(project(":js:js.frontend")) - testCompile(project(":js:js.translator")) - testCompile(project(":native:frontend.native")) + testApi(kotlinStdlib("jdk8")) + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":core:descriptors")) + testApi(project(":core:descriptors.jvm")) + testApi(project(":core:deserialization")) + testApi(project(":compiler:util")) + testApi(project(":compiler:tests-mutes")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:ir.tree.impl")) + testApi(project(":compiler:fir:tree")) + testApi(project(":compiler:fir:raw-fir:psi2fir")) + testApi(project(":compiler:fir:raw-fir:light-tree2fir")) + testApi(project(":compiler:fir:fir2ir")) + testApi(project(":compiler:fir:fir2ir:jvm-backend")) + testApi(project(":compiler:fir:fir-serialization")) + testApi(project(":compiler:fir:fir-deserialization")) + testApi(project(":compiler:fir:cones")) + testApi(project(":compiler:fir:resolve")) + testApi(project(":compiler:fir:checkers")) + testApi(project(":compiler:fir:checkers:checkers.jvm")) + testApi(project(":compiler:fir:java")) + testApi(project(":compiler:fir:entrypoint")) + testApi(project(":compiler:ir.ir2cfg")) + testApi(project(":compiler:frontend")) + testApi(project(":compiler:frontend.java")) + testApi(project(":compiler:util")) + testApi(project(":compiler:cli-common")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:cli-js")) + testApi(project(":compiler:light-classes")) + testApi(project(":compiler:serialization")) + testApi(project(":kotlin-preloader")) + testApi(project(":compiler:cli-common")) + testApi(project(":daemon-common")) + testApi(project(":daemon-common-new")) + testApi(project(":js:js.serializer")) + testApi(project(":js:js.frontend")) + testApi(project(":js:js.translator")) + testApi(project(":native:frontend.native")) testCompileOnly(project(":plugins:android-extensions-compiler")) testApi(projectTests(":generators:test-generator")) - testCompile(projectTests(":compiler:tests-compiler-utils")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(projectTests(":compiler:tests-common-jvm6")) - testCompile(project(":kotlin-scripting-compiler-impl")) - testCompile(projectTests(":compiler:test-infrastructure-utils")) - testCompile(commonDep("junit:junit")) - testCompile(commonDep("com.android.tools:r8")) + testApi(projectTests(":compiler:tests-compiler-utils")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(projectTests(":compiler:tests-common-jvm6")) + testApi(project(":kotlin-scripting-compiler-impl")) + testApi(projectTests(":compiler:test-infrastructure-utils")) + testApi(commonDep("junit:junit")) + testApi(commonDep("com.android.tools:r8")) testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(toolsJar()) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - testCompile(intellijDep()) { + testApi(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } + testApi(intellijDep()) { includeJars( "guava", "trove4j", diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts index 9a69c8892cc..f2be92ed6c5 100644 --- a/compiler/tests-compiler-utils/build.gradle.kts +++ b/compiler/tests-compiler-utils/build.gradle.kts @@ -5,31 +5,31 @@ plugins { } dependencies { - testCompile(kotlinStdlib("jdk8")) - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":core:descriptors")) - testCompile(project(":core:descriptors.jvm")) - testCompile(project(":core:deserialization")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:tests-mutes")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:ir.ir2cfg")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.java")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:psi")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:cli-js")) - testCompile(project(":compiler:serialization")) - testCompile(project(":compiler:fir:entrypoint")) - testCompile(project(":compiler:backend.jvm.entrypoint")) - testCompile(projectTests(":compiler:test-infrastructure-utils")) - testCompile(project(":kotlin-preloader")) - testCompile(commonDep("com.android.tools:r8")) + testApi(kotlinStdlib("jdk8")) + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":core:descriptors")) + testApi(project(":core:descriptors.jvm")) + testApi(project(":core:deserialization")) + testApi(project(":compiler:util")) + testApi(project(":compiler:tests-mutes")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:ir.ir2cfg")) + testApi(project(":compiler:frontend")) + testApi(project(":compiler:frontend.java")) + testApi(project(":compiler:util")) + testApi(project(":compiler:psi")) + testApi(project(":compiler:cli-common")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:cli-js")) + testApi(project(":compiler:serialization")) + testApi(project(":compiler:fir:entrypoint")) + testApi(project(":compiler:backend.jvm.entrypoint")) + testApi(projectTests(":compiler:test-infrastructure-utils")) + testApi(project(":kotlin-preloader")) + testApi(commonDep("com.android.tools:r8")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(intellijDep()) { + testApi(intellijDep()) { includeJars( "jps-model", "extensions", diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 2bd03e3fe96..98266abea02 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -6,17 +6,17 @@ plugins { val testJvm6ServerRuntime by configurations.creating dependencies { - testCompile(projectTests(":compiler")) + testApi(projectTests(":compiler")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-compiler-utils")) - testCompile(projectTests(":compiler:tests-common-new")) + testApi(projectTests(":compiler:tests-common-new")) testApiJUnit5(vintageEngine = true, runner = true, suiteApi = true) testImplementation(intellijCoreDep()) { includeJars("intellij-core") } - testRuntime(project(":kotlin-reflect")) - testRuntime(intellijDep()) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(intellijDep()) testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6")) } diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 622a96a6358..0e4160ff7f0 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -6,13 +6,13 @@ plugins { } dependencies { - testCompile(project(":kotlin-scripting-compiler")) - testCompile(projectTests(":compiler:tests-common")) + testApi(project(":kotlin-scripting-compiler")) + testApi(projectTests(":compiler:tests-common")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(projectTests(":generators:test-generator")) - testRuntime(project(":kotlin-reflect")) + testApi(projectTests(":generators:test-generator")) + testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(toolsJar()) - testRuntime(intellijDep()) + testRuntimeOnly(intellijDep()) testRuntimeOnly(intellijPluginDep("java")) if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) } diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts index befda52fede..a01d463c12b 100644 --- a/compiler/tests-spec/build.gradle.kts +++ b/compiler/tests-spec/build.gradle.kts @@ -4,21 +4,21 @@ plugins { } dependencies { - testCompile(projectTests(":compiler")) + testApi(projectTests(":compiler")) testImplementation(projectTests(":compiler:test-infrastructure")) testImplementation(projectTests(":compiler:tests-common-new")) - testCompile(intellijDep()) { + testApi(intellijDep()) { includeJars("groovy", "groovy-xml", rootProject = rootProject) } - testCompile(intellijDep()) { + testApi(intellijDep()) { includeJars("gson", rootProject = rootProject) } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijPluginDep("java")) - compile("org.jsoup:jsoup:1.14.2") + api("org.jsoup:jsoup:1.14.2") if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) - testRuntime(project(":kotlin-reflect")) + testRuntimeOnly(project(":kotlin-reflect")) testApiJUnit5(vintageEngine = true) } diff --git a/compiler/util-klib-metadata/build.gradle.kts b/compiler/util-klib-metadata/build.gradle.kts index 2079b191137..d15c8960bb0 100644 --- a/compiler/util-klib-metadata/build.gradle.kts +++ b/compiler/util-klib-metadata/build.gradle.kts @@ -11,9 +11,9 @@ dependencies { compileOnly(project(":core:deserialization")) compileOnly(project(":compiler:serialization")) - compile(kotlinStdlib()) - compile(project(":kotlin-util-io")) - compile(project(":kotlin-util-klib")) + api(kotlinStdlib()) + api(project(":kotlin-util-io")) + api(project(":kotlin-util-klib")) } sourceSets { diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts index 61a8af578e6..6fb9f3d3494 100644 --- a/compiler/util-klib/build.gradle.kts +++ b/compiler/util-klib/build.gradle.kts @@ -6,8 +6,8 @@ plugins { description = "Common klib reader and writer" dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-util-io")) + api(kotlinStdlib()) + api(project(":kotlin-util-io")) testImplementation(commonDep("junit:junit")) } diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts index 4249afb5b15..50b3796a6da 100644 --- a/compiler/visualizer/build.gradle.kts +++ b/compiler/visualizer/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { testImplementation(projectTests(":generators:test-generator")) testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.4.1-4") } - testRuntimeOnly(compile(intellijDep()) { includeJars("jna", rootProject = rootProject) }) + testRuntimeOnly(intellijDep()) { includeJars("jna", rootProject = rootProject) } } val generationRoot = projectDir.resolve("tests-gen") diff --git a/compiler/visualizer/common/build.gradle.kts b/compiler/visualizer/common/build.gradle.kts index d94401ab038..8109176ddf7 100644 --- a/compiler/visualizer/common/build.gradle.kts +++ b/compiler/visualizer/common/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":compiler:frontend")) + api(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/visualizer/render-fir/build.gradle.kts b/compiler/visualizer/render-fir/build.gradle.kts index 4c4e1b7d769..356176c53b1 100644 --- a/compiler/visualizer/render-fir/build.gradle.kts +++ b/compiler/visualizer/render-fir/build.gradle.kts @@ -4,9 +4,9 @@ plugins { } dependencies { - compile(project(":compiler:fir:raw-fir:psi2fir")) - compile(project(":compiler:fir:resolve")) - compile(project(":compiler:visualizer:common")) + api(project(":compiler:fir:raw-fir:psi2fir")) + api(project(":compiler:fir:resolve")) + api(project(":compiler:visualizer:common")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/visualizer/render-psi/build.gradle.kts b/compiler/visualizer/render-psi/build.gradle.kts index f9d512a25f0..300f9a39b22 100644 --- a/compiler/visualizer/render-psi/build.gradle.kts +++ b/compiler/visualizer/render-psi/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - compile(project(":compiler:visualizer:common")) - compile(intellijCoreDep()) { includeJars("intellij-core") } + api(project(":compiler:visualizer:common")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/core/compiler.common/build.gradle.kts b/core/compiler.common/build.gradle.kts index 088de63dc8f..e8022e8d91b 100644 --- a/core/compiler.common/build.gradle.kts +++ b/core/compiler.common/build.gradle.kts @@ -6,9 +6,9 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(project(":core:util.runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-annotations-jvm")) + api(project(":core:util.runtime")) + api(kotlinStdlib()) + api(project(":kotlin-annotations-jvm")) } sourceSets { diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts index f8b51325124..0af4de5d72c 100644 --- a/core/descriptors.jvm/build.gradle.kts +++ b/core/descriptors.jvm/build.gradle.kts @@ -6,13 +6,13 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(project(":kotlin-annotations-jvm")) - compile(project(":core:descriptors")) - compile(project(":core:deserialization")) + api(project(":kotlin-annotations-jvm")) + api(project(":core:descriptors")) + api(project(":core:deserialization")) api(project(":core:compiler.common.jvm")) api(project(":core:deserialization.common.jvm")) - compile(project(":core:util.runtime")) - compile(commonDep("javax.inject")) + api(project(":core:util.runtime")) + api(commonDep("javax.inject")) } sourceSets { diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts index 0cd97dbf8c5..2c57c958079 100644 --- a/core/descriptors.runtime/build.gradle.kts +++ b/core/descriptors.runtime/build.gradle.kts @@ -22,8 +22,8 @@ dependencies { compileOnly(project(":core:descriptors")) compileOnly(project(":core:descriptors.jvm")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":generators:test-generator")) + testApi(projectTests(":compiler:tests-common")) + testApi(projectTests(":generators:test-generator")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index 52a0c6c5eb5..c39470e3d59 100644 --- a/core/descriptors/build.gradle.kts +++ b/core/descriptors/build.gradle.kts @@ -6,10 +6,10 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(project(":core:compiler.common")) - compile(project(":core:util.runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-annotations-jvm")) + api(project(":core:compiler.common")) + api(project(":core:util.runtime")) + api(kotlinStdlib()) + api(project(":kotlin-annotations-jvm")) } sourceSets { diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts index 6b97641e306..1acbfe66433 100644 --- a/core/deserialization/build.gradle.kts +++ b/core/deserialization/build.gradle.kts @@ -6,11 +6,11 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(project(":core:metadata")) + api(project(":core:metadata")) api(project(":core:deserialization.common")) - compile(project(":core:util.runtime")) - compile(project(":core:descriptors")) - compile(commonDep("javax.inject")) + api(project(":core:util.runtime")) + api(project(":core:descriptors")) + api(commonDep("javax.inject")) } sourceSets { diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts index bb8c1e41499..2c057f87691 100644 --- a/core/metadata/build.gradle.kts +++ b/core/metadata/build.gradle.kts @@ -6,8 +6,8 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(protobufLite()) - compile(kotlinStdlib()) + api(protobufLite()) + api(kotlinStdlib()) } sourceSets { diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts index b33ec95f25b..19ffea85088 100644 --- a/generators/analysis-api-generator/build.gradle.kts +++ b/generators/analysis-api-generator/build.gradle.kts @@ -9,14 +9,14 @@ sourceSets { } dependencies { - compile(kotlinStdlib("jdk8")) + api(kotlinStdlib("jdk8")) - testCompile(projectTests(":generators:test-generator")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:tests-spec")) - testCompile(projectTests("::analysis:low-level-api-fir")) - testCompile(projectTests(":analysis:analysis-api-fir")) - testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + 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(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } testApiJUnit5() } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 0591f75b220..483f7272572 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -30,8 +30,8 @@ val (wasmSourceSet, wasmApi) = extraSourceSet("wasm") dependencies { // for GeneratorsFileUtil - compile(kotlinStdlib("jdk8")) - compile(intellijDep()) { includeJars("util") } + api(kotlinStdlib("jdk8")) + api(intellijDep()) { includeJars("util") } builtinsApi("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") { isTransitive = false } evaluateApi(project(":core:deserialization")) @@ -43,33 +43,33 @@ dependencies { protobufApi(kotlinStdlib()) protobufCompareApi(projectTests(":kotlin-build-common")) - testCompile(builtinsSourceSet.output) - testCompile(evaluateSourceSet.output) - testCompile(interpreterSourceSet.output) - testCompile(protobufSourceSet.output) - testCompile(protobufCompareSourceSet.output) + testApi(builtinsSourceSet.output) + testApi(evaluateSourceSet.output) + testApi(interpreterSourceSet.output) + testApi(protobufSourceSet.output) + testApi(protobufCompareSourceSet.output) - testCompile(projectTests(":compiler:cli")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(projectTests(":plugins:jvm-abi-gen")) - testCompile(projectTests(":plugins:android-extensions-compiler")) - testCompile(projectTests(":plugins:parcelize:parcelize-compiler")) - testCompile(projectTests(":kotlin-annotation-processing")) - testCompile(projectTests(":kotlin-annotation-processing-cli")) - testCompile(projectTests(":kotlin-allopen-compiler-plugin")) - testCompile(projectTests(":kotlin-noarg-compiler-plugin")) - testCompile(projectTests(":plugins:lombok:lombok-compiler-plugin")) - testCompile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) - testCompile(projectTests(":kotlinx-serialization-compiler-plugin")) - testCompile(projectTests(":plugins:fir:fir-plugin-prototype")) - testCompile(projectTests(":generators:test-generator")) + testApi(projectTests(":compiler:cli")) + testApi(projectTests(":compiler:incremental-compilation-impl")) + testApi(projectTests(":plugins:jvm-abi-gen")) + testApi(projectTests(":plugins:android-extensions-compiler")) + testApi(projectTests(":plugins:parcelize:parcelize-compiler")) + testApi(projectTests(":kotlin-annotation-processing")) + testApi(projectTests(":kotlin-annotation-processing-cli")) + testApi(projectTests(":kotlin-allopen-compiler-plugin")) + testApi(projectTests(":kotlin-noarg-compiler-plugin")) + testApi(projectTests(":plugins:lombok:lombok-compiler-plugin")) + testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) + testApi(projectTests(":kotlinx-serialization-compiler-plugin")) + testApi(projectTests(":plugins:fir:fir-plugin-prototype")) + testApi(projectTests(":generators:test-generator")) testCompileOnly(project(":kotlin-reflect-api")) - testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(project(":kotlin-reflect")) + testImplementation(intellijDep()) { includeJars("idea_rt") } + testImplementation(project(":kotlin-reflect")) if (Ide.IJ()) { testCompileOnly(jpsBuildTest()) - testCompile(jpsBuildTest()) + testApi(jpsBuildTest()) } } diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index eb9cadc61a2..4dda7670866 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } dependencies { - testCompile(intellijDep()) { includeJars("util") } - testCompile(project(":core:util.runtime")) + testApi(intellijDep()) { includeJars("util") } + testApi(project(":core:util.runtime")) testApi(projectTests(":compiler:test-infrastructure-utils")) - testCompile(kotlinStdlib()) - testCompile(commonDep("junit:junit")) - testCompile(project(":generators")) + testApi(kotlinStdlib()) + testApi(commonDep("junit:junit")) + testApi(project(":generators")) } sourceSets { diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts index 7decea35615..10db33c49eb 100644 --- a/js/js.ast/build.gradle.kts +++ b/js/js.ast/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":core:descriptors")) + api(project(":core:descriptors")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j") } } diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts index 96c2d034a5c..62612b1ad9f 100644 --- a/js/js.dce/build.gradle.kts +++ b/js/js.dce/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":js:js.ast")) - compile(project(":js:js.translator")) + api(project(":compiler:util")) + api(project(":js:js.ast")) + api(project(":js:js.translator")) compileOnly(project(":js:js.sourcemap")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } diff --git a/js/js.engines/build.gradle.kts b/js/js.engines/build.gradle.kts index bcbd4322986..f2e23e832e4 100644 --- a/js/js.engines/build.gradle.kts +++ b/js/js.engines/build.gradle.kts @@ -5,10 +5,10 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":js:js.ast")) - compile(project(":js:js.translator")) - compile(intellijCoreDep()) { includeJars("intellij-core") } + api(project(":compiler:util")) + api(project(":js:js.ast")) + api(project(":js:js.translator")) + api(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts index acfea6ac414..26c18b8a0d7 100644 --- a/js/js.frontend/build.gradle.kts +++ b/js/js.frontend/build.gradle.kts @@ -4,12 +4,12 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":js:js.ast")) - compile(project(":js:js.parser")) - compile(project(":js:js.serializer")) - compile(project(":js:js.config")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":js:js.ast")) + api(project(":js:js.parser")) + api(project(":js:js.serializer")) + api(project(":js:js.config")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } } diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts index c21c90ac649..80a5a9807e5 100644 --- a/js/js.parser/build.gradle.kts +++ b/js/js.parser/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(kotlinStdlib()) - compile(project(":js:js.ast")) + api(project(":js:js.ast")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts index 7f496242c40..8565882dcaf 100644 --- a/js/js.serializer/build.gradle.kts +++ b/js/js.serializer/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } dependencies { - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:serialization")) - compile(project(":js:js.ast")) - compile(project(":js:js.config")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:serialization")) + api(project(":js:js.ast")) + api(project(":js:js.config")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index fa94b68cec5..451863fb64d 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -27,45 +27,45 @@ val testJsRuntime by configurations.creating { } dependencies { - testRuntime(intellijDep()) + testRuntimeOnly(intellijDep()) - testCompile(protobufFull()) - testCompile(projectTests(":compiler:tests-common")) + testApi(protobufFull()) + testApi(projectTests(":compiler:tests-common")) testCompileOnly(project(":compiler:frontend")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":compiler:cli-js")) testCompileOnly(project(":compiler:util")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") } - testCompile(project(":compiler:backend.js")) - testCompile(project(":compiler:backend.wasm")) - testCompile(project(":js:js.translator")) - testCompile(project(":js:js.serializer")) - testCompile(project(":js:js.dce")) - testCompile(project(":js:js.engines")) - testCompile(project(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(projectTests(":kotlin-build-common")) - testCompile(projectTests(":generators:test-generator")) + testApi(project(":compiler:backend.js")) + testApi(project(":compiler:backend.wasm")) + testApi(project(":js:js.translator")) + testApi(project(":js:js.serializer")) + testApi(project(":js:js.dce")) + testApi(project(":js:js.engines")) + testApi(project(":compiler:incremental-compilation-impl")) + testApi(commonDep("junit:junit")) + testApi(projectTests(":kotlin-build-common")) + testApi(projectTests(":generators:test-generator")) - testCompile(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:util")) + testApi(intellijCoreDep()) { includeJars("intellij-core") } + testApi(project(":compiler:frontend")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:util")) - testRuntime(project(":kotlin-reflect")) + testRuntimeOnly(project(":kotlin-reflect")) - testRuntime(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) } + testRuntimeOnly(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) } - testRuntime(kotlinStdlib()) + testRuntimeOnly(kotlinStdlib()) testJsRuntime(kotlinStdlib("js")) if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) // it's required for ant tests - testRuntime(project(":compiler:backend-common")) - testRuntime(commonDep("org.fusesource.jansi", "jansi")) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests + testRuntimeOnly(project(":compiler:backend-common")) + testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi")) antLauncherJar(commonDep("org.apache.ant", "ant")) antLauncherJar(toolsJar()) diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts index d00ab322ef8..19902e5c5b3 100644 --- a/js/js.translator/build.gradle.kts +++ b/js/js.translator/build.gradle.kts @@ -7,13 +7,13 @@ plugins { } dependencies { - compile(project(":core:descriptors")) - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compile(project(":compiler:backend-common")) - compile(project(":js:js.ast")) - compile(project(":js:js.frontend")) - compile(project(":js:js.parser")) + api(project(":core:descriptors")) + api(project(":compiler:util")) + api(project(":compiler:frontend")) + api(project(":compiler:backend-common")) + api(project(":js:js.ast")) + api(project(":js:js.frontend")) + api(project(":js:js.parser")) compileOnly(project(":js:js.sourcemap")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) } diff --git a/kotlin-native/Interop/Indexer/build.gradle.kts b/kotlin-native/Interop/Indexer/build.gradle.kts index 62a3c22c0c3..3728fff191a 100644 --- a/kotlin-native/Interop/Indexer/build.gradle.kts +++ b/kotlin-native/Interop/Indexer/build.gradle.kts @@ -150,8 +150,8 @@ sourceSets { } dependencies { - compile(project(":kotlin-stdlib")) - compile(project(":kotlin-native:Interop:Runtime")) + api(project(":kotlin-stdlib")) + api(project(":kotlin-native:Interop:Runtime")) testImplementation(kotlin("test-junit")) } diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index ca33599df46..b3b7ecb4718 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -75,15 +75,11 @@ configurations { trove4j_jar kotlinCommonSources - cli_bcRuntime { - extendsFrom compilerRuntime - extendsFrom kotlin_script_runtime_jar + cli_bcApiElements { + extendsFrom cli_bcApi } - cli_bc { - extendsFrom cli_bcRuntime - } - cli_bcCompile.extendsFrom compilerCompile + cli_bcApi.extendsFrom compilerApi } dependencies { @@ -97,30 +93,30 @@ dependencies { kotlinCommonSources(it) { transitive = false } } - compilerCompile project(":kotlin-native:utilities:basic-utils") + compilerApi project(":kotlin-native:utilities:basic-utils") - compilerCompile project(kotlinCompilerModule) - compilerCompile project(":native:kotlin-native-utils") - compilerCompile project(":core:descriptors") - compilerCompile project(":compiler:ir.tree") - compilerCompile project(":compiler:ir.tree.impl") - compilerCompile project(":compiler:ir.backend.common") - compilerCompile project(":compiler:util") - compilerCompile project(":native:frontend.native") - compilerCompile project(":compiler:cli-common") - compilerCompile project(":compiler:cli") - compilerCompile project(":kotlin-util-klib") - compilerCompile project(":kotlin-util-klib-metadata") - compilerCompile project(":compiler:ir.serialization.common") - compilerCompile project(":compiler:ir.psi2ir") + compilerApi project(kotlinCompilerModule) + compilerApi project(":native:kotlin-native-utils") + compilerApi project(":core:descriptors") + compilerApi project(":compiler:ir.tree") + compilerApi project(":compiler:ir.tree.impl") + compilerApi project(":compiler:ir.backend.common") + compilerApi project(":compiler:util") + compilerApi project(":native:frontend.native") + compilerApi project(":compiler:cli-common") + compilerApi project(":compiler:cli") + compilerApi project(":kotlin-util-klib") + compilerApi project(":kotlin-util-klib-metadata") + compilerApi project(":compiler:ir.serialization.common") + compilerApi project(":compiler:ir.psi2ir") use(LocalDependenciesKt) { - compilerCompile(intellijCoreDep()){ + compilerApi(intellijCoreDep()){ artifact { name = "intellij-core" type = "jar" } } - compilerCompile(intellijDep()){ + compilerApi(intellijDep()){ artifact { name = "util" type = "jar" @@ -130,13 +126,13 @@ dependencies { compileOnly(jpsStandalone()) } - compilerCompile kotlinNativeInterop['llvm'].configuration - compilerCompile kotlinNativeInterop['files'].configuration + compilerApi kotlinNativeInterop['llvm'].configuration + compilerApi kotlinNativeInterop['files'].configuration - cli_bcCompile sourceSets.compiler.output + cli_bcApi sourceSets.compiler.output - cli_bc sourceSets.cli_bc.output + cli_bcApiElements sourceSets.cli_bc.output } diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index ff4083d4b5b..b9d23b48ca7 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -41,14 +41,13 @@ configurations { update_tests update_stdlib_tests - compile - nopPluginCompile - compile.extendsFrom nopPluginCompile + nopPluginApi + api.extendsFrom nopPluginApi } dependencies { - compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' - cli_bc project(path: ':kotlin-native:backend.native', configuration: 'cli_bc') + api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' + cli_bc project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') } ext.testOutputRoot = rootProject.file("test.output").absolutePath ext.externalTestsDir = project.file("build/external") @@ -5814,23 +5813,23 @@ pluginTest("runtime_basic_init", "nopPlugin") { } dependencies { - nopPluginCompile project(kotlinCompilerModule) - nopPluginCompile project(":native:kotlin-native-utils") - nopPluginCompile project(":core:descriptors") - nopPluginCompile project(":compiler:ir.tree") - nopPluginCompile project(":compiler:ir.tree.impl") - nopPluginCompile project(":compiler:ir.backend.common") - nopPluginCompile project(":compiler:util") - nopPluginCompile project(":native:frontend.native") - nopPluginCompile project(":compiler:cli-common") - nopPluginCompile project(":compiler:cli") - nopPluginCompile project(":kotlin-util-klib") - nopPluginCompile project(":kotlin-util-klib-metadata") - nopPluginCompile project(":compiler:ir.serialization.common") + nopPluginApi project(kotlinCompilerModule) + nopPluginApi project(":native:kotlin-native-utils") + nopPluginApi project(":core:descriptors") + nopPluginApi project(":compiler:ir.tree") + nopPluginApi project(":compiler:ir.tree.impl") + nopPluginApi project(":compiler:ir.backend.common") + nopPluginApi project(":compiler:util") + nopPluginApi project(":native:frontend.native") + nopPluginApi project(":compiler:cli-common") + nopPluginApi project(":compiler:cli") + nopPluginApi project(":kotlin-util-klib") + nopPluginApi project(":kotlin-util-klib-metadata") + nopPluginApi project(":compiler:ir.serialization.common") - compile project(kotlinCompilerModule) - compile project(path: ':kotlin-native:backend.native', configuration: 'cli_bc') - compile 'junit:junit:4.12' + api project(kotlinCompilerModule) + api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') + api 'junit:junit:4.12' } project.tasks.named("test").configure { diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle index 336a0cf4133..88f1c1b75c0 100644 --- a/kotlin-native/klib/build.gradle +++ b/kotlin-native/klib/build.gradle @@ -42,7 +42,7 @@ repositories { dependencies { implementation project(":kotlin-stdlib") - implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bc') + implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') implementation project(":kotlin-native:utilities:basic-utils") testImplementation "junit:junit:4.12" testImplementation project(":kotlin-test:kotlin-test-junit") diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts index 1c046cd620b..8a3ab2dd62e 100644 --- a/libraries/examples/annotation-processor-example/build.gradle.kts +++ b/libraries/examples/annotation-processor-example/build.gradle.kts @@ -13,7 +13,7 @@ pill { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) } sourceSets { diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index edccbb86802..a63d71624d6 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -12,11 +12,11 @@ pill { } dependencies { - compile project(':kotlin-gradle-plugin-api') + api project(':kotlin-gradle-plugin-api') // Use this dependency instead when building apart from the other modules: // compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlin_version" - compile project(':kotlin-test::kotlin-test-junit') + api project(':kotlin-test::kotlin-test-junit') compileOnly kotlinStdlib() compileOnly project(':compiler') diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts index 80d40a91491..58eed923ba4 100644 --- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts @@ -19,15 +19,15 @@ val compilerClasspath by configurations.creating { } dependencies { - testCompile(kotlinStdlib()) - testCompile(project(":kotlin-script-runtime")) - testCompile(project(":kotlin-script-util")) - testCompile(projectRuntimeJar(":kotlin-daemon-client")) - testCompile(projectRuntimeJar(":kotlin-daemon-embeddable")) - testCompile(projectRuntimeJar(":kotlin-compiler-embeddable")) - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testRuntime(project(":kotlin-reflect")) + testApi(kotlinStdlib()) + testApi(project(":kotlin-script-runtime")) + testApi(project(":kotlin-script-util")) + testApi(projectRuntimeJar(":kotlin-daemon-client")) + testApi(projectRuntimeJar(":kotlin-daemon-embeddable")) + testApi(projectRuntimeJar(":kotlin-compiler-embeddable")) + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-junit")) + testRuntimeOnly(project(":kotlin-reflect")) compilerClasspath(project(":kotlin-reflect")) compilerClasspath(kotlinStdlib()) compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j")) diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts index 3e49cfde6fe..547ebd1d26e 100644 --- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts @@ -12,18 +12,18 @@ pill { } dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-script-runtime")) - compile(project(":kotlin-compiler-embeddable")) - compile(project(":kotlin-script-util")) - runtime(project(":kotlin-scripting-compiler-embeddable")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testRuntime(project(":kotlin-reflect")) + api(kotlinStdlib()) + api(project(":kotlin-script-runtime")) + api(project(":kotlin-compiler-embeddable")) + api(project(":kotlin-script-util")) + runtimeOnly(project(":kotlin-scripting-compiler-embeddable")) + testApi(project(":kotlin-test:kotlin-test-junit")) + testApi(commonDep("junit:junit")) + testRuntimeOnly(project(":kotlin-reflect")) compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build) - testRuntime(project(":kotlin-scripting-compiler-embeddable")) + testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) } projectTest() diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts index 26ff8ee3446..c4079f004af 100644 --- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts @@ -4,14 +4,14 @@ plugins { } dependencies { - compile(project(":examples:scripting-jvm-simple-script")) + api(project(":examples:scripting-jvm-simple-script")) compileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testRuntimeOnly(project(":kotlin-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-jvm-host")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } - testCompile(commonDep("junit")) + testApi(commonDep("junit")) } sourceSets { diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts index 003d329e8ed..99fd9d8ed07 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts @@ -4,9 +4,9 @@ plugins { } dependencies { - compile(project(":examples:scripting-jvm-maven-deps")) - compile(project(":kotlin-scripting-jvm-host-unshaded")) - compile(kotlinStdlib()) + api(project(":examples:scripting-jvm-maven-deps")) + api(project(":kotlin-scripting-jvm-host-unshaded")) + api(kotlinStdlib()) compileOnly(project(":kotlin-reflect-api")) compileOnly(project(":compiler:util")) @@ -14,7 +14,7 @@ dependencies { testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":kotlin-scripting-compiler")) - testCompile(commonDep("junit")) + testApi(commonDep("junit")) } sourceSets { diff --git a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts index 359698e4f8d..08ec28c1f27 100644 --- a/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - compile(project(":kotlin-scripting-jvm")) - compile(project(":kotlin-scripting-dependencies")) - compile(project(":kotlin-scripting-dependencies-maven")) - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) + api(project(":kotlin-scripting-jvm")) + api(project(":kotlin-scripting-dependencies")) + api(project(":kotlin-scripting-dependencies-maven")) + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) } sourceSets { diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts index 6e59c5e0f38..7301fbb8426 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts @@ -4,13 +4,13 @@ plugins { } dependencies { - compile(project(":examples:scripting-jvm-simple-script")) - compile(project(":kotlin-scripting-jvm-host-unshaded")) - compile(project(":kotlin-script-util")) + api(project(":examples:scripting-jvm-simple-script")) + api(project(":kotlin-scripting-jvm-host-unshaded")) + api(project(":kotlin-script-util")) testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-reflect")) - testCompile(commonDep("junit")) + testApi(commonDep("junit")) } sourceSets { diff --git a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts index 41fc68c6d65..a5bc53f0fed 100644 --- a/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - compile(project(":kotlin-scripting-jvm")) + api(project(":kotlin-scripting-jvm")) } sourceSets { diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle index ed799821538..ff7cfeb82f2 100644 --- a/libraries/kotlin.test/annotations-common/build.gradle +++ b/libraries/kotlin.test/annotations-common/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common' JvmToolchain.updateJvmTarget(project, "1.6") dependencies { - compile kotlinStdlib("common") - testCompile project(":kotlin-test:kotlin-test-common") + api kotlinStdlib("common") + testApi project(":kotlin-test:kotlin-test-common") } tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) { diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle index 1196a794e3a..75a4e84bed5 100644 --- a/libraries/kotlin.test/common/build.gradle +++ b/libraries/kotlin.test/common/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common' JvmToolchain.updateJvmTarget(project, "1.6") dependencies { - compile kotlinStdlib("common") - testCompile project(":kotlin-test:kotlin-test-annotations-common") + api kotlinStdlib("common") + testApi project(":kotlin-test:kotlin-test-annotations-common") } jar { diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle index 63d7fcb6b40..087852dd90f 100644 --- a/libraries/kotlin.test/js/build.gradle +++ b/libraries/kotlin.test/js/build.gradle @@ -10,7 +10,7 @@ configurations { dependencies { expectedBy project(':kotlin-test:kotlin-test-common') expectedBy project(':kotlin-test:kotlin-test-annotations-common') - compile kotlinStdlib("js") + api kotlinStdlib("js") } compileKotlin2Js { @@ -73,7 +73,6 @@ task sourcesJar(type: Jar, dependsOn: classes) { } artifacts { - runtime libraryJarWithIr archives libraryJarWithIr distLibrary libraryJarWithIr archives sourcesJar diff --git a/libraries/kotlin.test/js/it/build.gradle b/libraries/kotlin.test/js/it/build.gradle index eff234929a9..f453e473da3 100644 --- a/libraries/kotlin.test/js/it/build.gradle +++ b/libraries/kotlin.test/js/it/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'kotlin-platform-js' configurations { nodeModules { - extendsFrom compile + extendsFrom api attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME)) attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) @@ -21,7 +21,7 @@ configurations { } dependencies { - compile project(':kotlin-test:kotlin-test-js') + api project(':kotlin-test:kotlin-test-js') } // package.json contains direct links to the builddir diff --git a/libraries/kotlin.test/junit/build.gradle b/libraries/kotlin.test/junit/build.gradle index 0848158c8f3..92eb3c5c119 100644 --- a/libraries/kotlin.test/junit/build.gradle +++ b/libraries/kotlin.test/junit/build.gradle @@ -14,8 +14,8 @@ sourceSets { dependencies { expectedBy project(':kotlin-test:kotlin-test-annotations-common') - compile project(':kotlin-test:kotlin-test-jvm') - compile('junit:junit:4.12') + api project(':kotlin-test:kotlin-test-jvm') + api('junit:junit:4.12') } diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle index cca890788af..ee45d60e388 100644 --- a/libraries/kotlin.test/junit5/build.gradle +++ b/libraries/kotlin.test/junit5/build.gradle @@ -14,10 +14,10 @@ project.ext["jpsLibraryPath"] = rootProject.distLibDir dependencies { expectedBy project(':kotlin-test:kotlin-test-annotations-common') - compile project(':kotlin-test:kotlin-test-jvm') + api project(':kotlin-test:kotlin-test-jvm') - compile("org.junit.jupiter:junit-jupiter-api:5.0.0") - testRuntime("org.junit.jupiter:junit-jupiter-engine:5.2.0") + api("org.junit.jupiter:junit-jupiter-api:5.0.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0") } jar { diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 97cab72bd5c..ec33478daab 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -16,9 +16,9 @@ sourceSets { dependencies { expectedBy project(':kotlin-test:kotlin-test-common') - compile kotlinStdlib() - testCompile project(":kotlin-test:kotlin-test-junit") - testCompile('junit:junit:4.12') + api(kotlinStdlib()) + testApi(project(":kotlin-test:kotlin-test-junit")) + testApi('junit:junit:4.12') } jar { diff --git a/libraries/kotlin.test/testng/build.gradle b/libraries/kotlin.test/testng/build.gradle index 1b77e295028..2a69163372b 100644 --- a/libraries/kotlin.test/testng/build.gradle +++ b/libraries/kotlin.test/testng/build.gradle @@ -15,8 +15,8 @@ sourceSets { dependencies { expectedBy project(':kotlin-test:kotlin-test-annotations-common') - compile project(':kotlin-test:kotlin-test-jvm') - compile('org.testng:testng:6.13.1') + api project(':kotlin-test:kotlin-test-jvm') + api('org.testng:testng:6.13.1') if (includeJava9) { java9CompileOnly('org.testng:testng:7.0.0') } diff --git a/libraries/kotlinx-metadata/build.gradle.kts b/libraries/kotlinx-metadata/build.gradle.kts index c837eabaeae..36c464ffe9b 100644 --- a/libraries/kotlinx-metadata/build.gradle.kts +++ b/libraries/kotlinx-metadata/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(project(":core:metadata")) compileOnly(protobufLite()) } diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index 7454afcf514..ef5dffabc0b 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -37,7 +37,7 @@ val shadows by configurations.creating { isTransitive = false } configurations.getByName("compileOnly").extendsFrom(shadows) -configurations.getByName("testCompile").extendsFrom(shadows) +configurations.getByName("testApi").extendsFrom(shadows) dependencies { api(kotlinStdlib()) diff --git a/libraries/kotlinx-metadata/klib/build.gradle.kts b/libraries/kotlinx-metadata/klib/build.gradle.kts index fdf7b978ddb..b9d9bccf08b 100644 --- a/libraries/kotlinx-metadata/klib/build.gradle.kts +++ b/libraries/kotlinx-metadata/klib/build.gradle.kts @@ -25,10 +25,10 @@ val shadows by configurations.creating { isTransitive = false } configurations.getByName("compileOnly").extendsFrom(shadows) -configurations.getByName("testCompile").extendsFrom(shadows) +configurations.getByName("testApi").extendsFrom(shadows) dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) shadows(project(":kotlinx-metadata")) shadows(project(":core:compiler.common")) shadows(project(":core:metadata")) diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle index 4484e5e455e..ffdc97b03c4 100644 --- a/libraries/reflect/api/build.gradle +++ b/libraries/reflect/api/build.gradle @@ -22,7 +22,7 @@ sourceSets { } dependencies { - compile kotlinStdlib() + api kotlinStdlib() compileOnly project(':core:descriptors') compileOnly project(':core:descriptors.jvm') compileOnly project(':core:deserialization') @@ -69,5 +69,4 @@ task java9Jar(type: Jar) { artifacts { archives java9Jar - runtime java9Jar } diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 0f71c95c2ea..17b950af747 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -17,7 +17,7 @@ buildscript { } plugins { - java + `java-library` } configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6) @@ -35,10 +35,9 @@ val embedded by configurations embedded.isTransitive = false configurations.getByName("compileOnly").extendsFrom(embedded) -val mainJar by configurations.creating dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) proguardDeps(kotlinStdlib()) proguardAdditionalInJars(project(":kotlin-annotations-jvm")) @@ -256,8 +255,8 @@ dexMethodCount { } artifacts { - listOf(mainJar.name, "runtime", "archives", "runtimeElements").forEach { configurationName -> - add(configurationName, result.get().outputs.files.singleFile) { + listOf("archives", "runtimeElements").forEach { configurationName -> + add(configurationName, provider { result.get().outputs.files.singleFile }) { builtBy(result) } } diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 483a75ce00b..3b8409383bc 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -6,9 +6,9 @@ plugins { project.updateJvmTarget("1.6") dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(project(":kotlin-reflect-api")) - testCompile(commonDep("junit")) + testApi(commonDep("junit")) } sourceSets { diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts index a91a2b729e1..90c4b0f22b9 100644 --- a/libraries/scripting/dependencies/build.gradle.kts +++ b/libraries/scripting/dependencies/build.gradle.kts @@ -6,9 +6,9 @@ plugins { project.updateJvmTarget("1.6") dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-scripting-common")) - testCompile(commonDep("junit")) + api(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + testApi(commonDep("junit")) testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) } diff --git a/libraries/scripting/intellij/build.gradle.kts b/libraries/scripting/intellij/build.gradle.kts index cba252f6fa6..478fdec2686 100644 --- a/libraries/scripting/intellij/build.gradle.kts +++ b/libraries/scripting/intellij/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - compile(project(":kotlin-script-runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-scripting-common")) + api(project(":kotlin-script-runtime")) + api(kotlinStdlib()) + api(project(":kotlin-scripting-common")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 6f8184955e0..f815a89364d 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -5,16 +5,16 @@ plugins { val embeddableTestRuntime by configurations.creating dependencies { - testCompile(commonDep("junit")) + testApi(commonDep("junit")) - testCompile(project(":kotlin-scripting-js")) - testCompile(project(":compiler:plugin-api")) - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:backend.js")) - testCompile(project(":compiler:ir.tree.impl")) - testCompile(project(":js:js.engines")) - testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testApi(project(":kotlin-scripting-js")) + testApi(project(":compiler:plugin-api")) + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:backend.js")) + testApi(project(":compiler:ir.tree.impl")) + testApi(project(":js:js.engines")) + testApi(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "guava", "jdom", rootProject = rootProject) diff --git a/libraries/scripting/js/build.gradle.kts b/libraries/scripting/js/build.gradle.kts index 3cc6f71cf38..00387212a9a 100644 --- a/libraries/scripting/js/build.gradle.kts +++ b/libraries/scripting/js/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - compile(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-common")) compileOnly(project(":compiler:backend.js")) compileOnly(project(":compiler:cli-common")) compileOnly(project(":js:js.engines")) diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts index 93d8eaccd6a..f5366e88063 100644 --- a/libraries/scripting/jsr223-test/build.gradle.kts +++ b/libraries/scripting/jsr223-test/build.gradle.kts @@ -11,7 +11,7 @@ val embeddableTestRuntime by configurations.creating { } dependencies { - testCompile(commonDep("junit")) + testApi(commonDep("junit")) testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":core:util.runtime")) diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index 711d6c69402..a568b01de22 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -6,12 +6,12 @@ plugins { publish() dependencies { - compile(project(":kotlin-script-runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-scripting-common")) - compile(project(":kotlin-scripting-jvm")) - compile(project(":kotlin-scripting-jvm-host-unshaded")) - compile(project(":kotlin-scripting-compiler")) + api(project(":kotlin-script-runtime")) + api(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-jvm")) + api(project(":kotlin-scripting-jvm-host-unshaded")) + api(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli-common")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index 5d12e1c7688..a7e6fc1bafb 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } val allTestsRuntime by configurations.creating -val testCompile by configurations -testCompile.extendsFrom(allTestsRuntime) +val testApi by configurations +testApi.extendsFrom(allTestsRuntime) val embeddableTestRuntime by configurations.creating { extendsFrom(allTestsRuntime) } @@ -14,10 +14,10 @@ dependencies { allTestsRuntime(commonDep("junit")) allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") } allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") } - testCompile(project(":kotlin-scripting-jvm-host-unshaded")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build) + testApi(project(":kotlin-scripting-jvm-host-unshaded")) + testApi(projectTests(":compiler:tests-common")) + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":daemon-common")) // TODO: fix import (workaround for jps build) testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) testRuntimeOnly(project(":kotlin-compiler")) diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 76e64084dd7..e75f4b39bee 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -7,10 +7,10 @@ plugins { publish() dependencies { - compile(project(":kotlin-script-runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-scripting-common")) - compile(project(":kotlin-scripting-jvm")) + api(project(":kotlin-script-runtime")) + api(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-jvm")) compileOnly(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli")) compileOnly(project(":kotlin-reflect-api")) diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 0446ab6c547..962f9fc4b1c 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -6,10 +6,10 @@ plugins { project.configureJvmToolchain(JdkMajorVersion.JDK_1_6) dependencies { - compile(project(":kotlin-script-runtime")) - compile(kotlinStdlib()) - compile(project(":kotlin-scripting-common")) - testCompile(commonDep("junit")) + api(project(":kotlin-script-runtime")) + api(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + testApi(commonDep("junit")) } sourceSets { diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle index 128b486ad3d..1fc13851616 100644 --- a/libraries/stdlib/common/build.gradle +++ b/libraries/stdlib/common/build.gradle @@ -26,8 +26,8 @@ sourceSets { } dependencies { - testCompile project(":kotlin-test:kotlin-test-common") - testCompile project(":kotlin-test:kotlin-test-annotations-common") + testApi project(":kotlin-test:kotlin-test-common") + testApi project(":kotlin-test:kotlin-test-annotations-common") } compileKotlinCommon { diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 1ca7281c8b6..6087bf951f5 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -38,12 +38,12 @@ sourceSets { } configurations { - noJdk7TestCompile.extendsFrom(testCompile) + noJdk7TestApi.extendsFrom(testApi) } dependencies { - compile project(':kotlin-stdlib') - testCompile project(':kotlin-test:kotlin-test-junit') + api project(':kotlin-stdlib') + testApi project(':kotlin-test:kotlin-test-junit') } jar { diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 82873946bf4..c1dca4b9e6f 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -7,9 +7,9 @@ configureSourcesJar() configureJavadocJar() dependencies { - compile project(':kotlin-stdlib') - compile project(':kotlin-stdlib-jdk7') - testCompile project(':kotlin-test:kotlin-test-junit') + api project(':kotlin-stdlib') + api project(':kotlin-stdlib-jdk7') + testApi project(':kotlin-test:kotlin-test-junit') } sourceSets { diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 98b3aac1e20..9d0368fe84b 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -68,7 +68,7 @@ sourceSets { dependencies { expectedBy project(":kotlin-stdlib-common") commonSources project(path: ":kotlin-stdlib-common", configuration: "sources") - testCompile project(':kotlin-test:kotlin-test-js') + testApi project(':kotlin-test:kotlin-test-js') } task prepareComparableSource(type: Copy) { @@ -322,7 +322,6 @@ task distSourcesJar(type: Jar) { } artifacts { - runtime libraryJarWithIr publishedRuntime libraryJarWithIr publishedRuntime sourcesJar sources sourcesJar diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 7b31328801a..c5e7fe35cdb 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -17,11 +17,6 @@ val builtins by configurations.creating { } } -val runtime by configurations -val runtimeJar by configurations.creating { - runtime.extendsFrom(this) -} - dependencies { compileOnly(project(":kotlin-stdlib")) builtins(project(":core:builtins")) diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index bfb2df0b6c3..7d9129869a5 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -50,6 +50,7 @@ configurations { } } compileOnly.extendsFrom(builtins) + testCompileOnly.extendsFrom(builtins) } dependencies { @@ -57,9 +58,9 @@ dependencies { commonSources project(path: ":kotlin-stdlib-common", configuration: "sources") - compile group: 'org.jetbrains', name: 'annotations', version:'13.0' + api group: 'org.jetbrains', name: 'annotations', version:'13.0' - testCompile project(':kotlin-test:kotlin-test-junit') + testApi project(':kotlin-test:kotlin-test-junit') builtins project(':core:builtins') } diff --git a/libraries/stdlib/samples/build.gradle b/libraries/stdlib/samples/build.gradle index 13fdcd7888f..5a41e4abf99 100644 --- a/libraries/stdlib/samples/build.gradle +++ b/libraries/stdlib/samples/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'kotlin' dependencies { - compile project(':kotlin-stdlib-jdk8') - testCompile project(':kotlin-test:kotlin-test-junit') + api project(':kotlin-stdlib-jdk8') + testApi project(':kotlin-test:kotlin-test-junit') } sourceSets { diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle index 9341a9be191..d94c621b02f 100644 --- a/libraries/tools/binary-compatibility-validator/build.gradle +++ b/libraries/tools/binary-compatibility-validator/build.gradle @@ -6,9 +6,9 @@ configurations { } dependencies { - compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1") + api("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1") - testCompile project(':kotlin-test:kotlin-test-junit') + testApi project(':kotlin-test:kotlin-test-junit') testArtifacts project(':kotlin-stdlib') testArtifacts project(':kotlin-stdlib-jdk7') diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts index 0095c218ffc..f7caafe32a0 100644 --- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts @@ -5,9 +5,9 @@ plugins { } dependencies { - compile(gradleApi()) - compile(project(":kotlin-gradle-plugin-api")) - compile(project(":native:kotlin-native-utils")) + api(gradleApi()) + api(project(":kotlin-gradle-plugin-api")) + api(project(":native:kotlin-native-utils")) } val generateMppTargetContainerWithPresets by generator( diff --git a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts index b5bed7e668b..c692b508d53 100644 --- a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts @@ -9,7 +9,9 @@ import org.gradle.jvm.tasks.Jar description = "Shaded test jars from compiler for Gradle integration tests" -plugins { `java` } +plugins { + `java-library` +} val packedJars by configurations.creating @@ -22,7 +24,7 @@ val projectsToInclude = listOf( dependencies { for (projectName in projectsToInclude) { - compile(projectTests(projectName)) { isTransitive = false } + api(projectTests(projectName)) { isTransitive = false } packedJars(projectTests(projectName)) { isTransitive = false } } diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 45740bccd80..759e1ff8cdb 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -102,7 +102,7 @@ dependencies { } if (kotlinBuildProperties.isInJpsBuildIdeaSync) { - configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core") + configurations.api.get().exclude("com.android.tools.external.com-intellij", "intellij-core") } noDefaultJar() diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts index 8201fb58438..e8bfeaef08d 100644 --- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts @@ -6,13 +6,13 @@ plugins { } dependencies { - testCompile(project(":kotlin-main-kts")) + testApi(project(":kotlin-main-kts")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded")) - testCompile(kotlinStdlib("jdk8")) - testCompile(commonDep("junit")) - testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false } - testRuntime(project(":kotlin-compiler-embeddable")) + testApi(kotlinStdlib("jdk8")) + testApi(commonDep("junit")) + testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false } + testImplementation(project(":kotlin-compiler-embeddable")) } sourceSets { diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 7fe2c7025a1..3e90abd1ec9 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -17,7 +17,8 @@ val localPackagesToRelocate = val proguardLibraryJars by configurations.creating { attributes { - attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API)) + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) + attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR)) } } @@ -120,7 +121,7 @@ val resultJar by task { } } -addArtifact("runtime", resultJar) +addArtifact("apiElements", resultJar) addArtifact("runtimeElements", resultJar) addArtifact("archives", resultJar) diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 9fefeef9a53..4016d43b518 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -14,8 +14,8 @@ dependencies { compileOnly project(':compiler') compileOnly project(':kotlin-noarg-compiler-plugin') - testCompile gradleApi() - testCompile "junit:junit:4.12" + testApi gradleApi() + testApi "junit:junit:4.12" embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false } } diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 9c9f34e6ab1..65f57fba30b 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -14,8 +14,8 @@ dependencies { compileOnly project(':compiler') compileOnly project(':kotlin-sam-with-receiver-compiler-plugin') - testCompile gradleApi() - testCompile "junit:junit:4.12" + testApi gradleApi() + testApi "junit:junit:4.12" embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false } } diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index d30b039529a..ccf7d7a797e 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -7,29 +7,29 @@ plugins { } dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-script-runtime")) - compile(project(":kotlin-scripting-jvm")) - compile(commonDep("org.jetbrains.intellij.deps", "trove4j")) + api(kotlinStdlib()) + api(project(":kotlin-script-runtime")) + api(project(":kotlin-scripting-jvm")) + api(commonDep("org.jetbrains.intellij.deps", "trove4j")) compileOnly(project(":compiler:cli")) compileOnly(project(":daemon-common")) compileOnly(project(":kotlin-scripting-compiler")) - compile(projectRuntimeJar(":kotlin-daemon-client")) + api(projectRuntimeJar(":kotlin-daemon-client")) compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") compileOnly("org.sonatype.aether:aether-api:1.13.1") compileOnly("org.apache.maven:maven-core:3.0.3") testCompileOnly(project(":compiler:cli")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testRuntime(project(":kotlin-reflect")) - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-scripting-compiler")) + testApi(project(":kotlin-test:kotlin-test-junit")) + testImplementation(project(":kotlin-reflect")) + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-compiler")) - testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") - testRuntime("org.sonatype.aether:aether-api:1.13.1") - testRuntime("org.apache.maven:maven-core:3.0.3") + testImplementation("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") + testImplementation("org.sonatype.aether:aether-api:1.13.1") + testImplementation("org.apache.maven:maven-core:3.0.3") compileOnly(intellijDep()) { includeJars("util") } - testCompile(intellijDep()) { includeJars("platform-api", "util") } - testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testApi(intellijDep()) { includeJars("platform-api", "util") } + testApi(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle index ec43a9281b6..e8c288dea06 100644 --- a/libraries/tools/kotlin-serialization/build.gradle +++ b/libraries/tools/kotlin-serialization/build.gradle @@ -9,7 +9,7 @@ pill { dependencies { compileOnly project(':kotlin-gradle-plugin') - compile project(':kotlin-gradle-plugin-api') + api project(':kotlin-gradle-plugin-api') compileOnly kotlinStdlib() compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar') diff --git a/libraries/tools/kotlin-stdlib-gen/build.gradle b/libraries/tools/kotlin-stdlib-gen/build.gradle index f18b77051aa..c4bc60252e0 100644 --- a/libraries/tools/kotlin-stdlib-gen/build.gradle +++ b/libraries/tools/kotlin-stdlib-gen/build.gradle @@ -8,8 +8,8 @@ sourceSets { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion" - compile "org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion" + api "org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion" + api "org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion" } compileKotlin { diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle index ba7e9bf374a..f05d7629e00 100644 --- a/libraries/tools/script-runtime/build.gradle +++ b/libraries/tools/script-runtime/build.gradle @@ -10,10 +10,6 @@ dependencies { compileOnly kotlinStdlib() } -configurations { - mainJar -} - sourceSets { main { kotlin { @@ -26,10 +22,6 @@ jar { manifestAttributes(manifest, project, 'Main') } -artifacts { - mainJar jar -} - configureSourcesJar() configureJavadocJar() diff --git a/native/frontend/build.gradle.kts b/native/frontend/build.gradle.kts index b9729dae68b..c41110cbc5f 100644 --- a/native/frontend/build.gradle.kts +++ b/native/frontend/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compile(project(":native:kotlin-native-utils")) + api(project(":native:kotlin-native-utils")) } sourceSets { diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index aae3021210d..547b99cad66 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -13,10 +13,10 @@ dependencies { runtimeOnly(kotlinStdlib()) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:cli")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:cli")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index add198b9a24..e2b55135d70 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -10,7 +10,7 @@ val robolectricClasspath by configurations.creating val androidExtensionsRuntimeForTests by configurations.creating dependencies { - testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testApi(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(project(":compiler:util")) compileOnly(project(":compiler:plugin-api")) @@ -24,18 +24,18 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } - testCompile(project(":compiler:util")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:ir.backend.common")) - testCompile(project(":compiler:backend.jvm")) - testCompile(project(":compiler:cli")) - testCompile(project(":kotlin-android-extensions-runtime")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:util")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:ir.backend.common")) + testApi(project(":compiler:backend.jvm")) + testApi(project(":compiler:cli")) + testApi(project(":kotlin-android-extensions-runtime")) + testApi(projectTests(":compiler:tests-common")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(commonDep("junit:junit")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijDep()) + testRuntimeOnly(intellijPluginDep("junit")) + testRuntimeOnly(intellijDep()) robolectricClasspath(commonDep("org.robolectric", "robolectric")) robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1") diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index ee4f014e4b7..50a16888b9a 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -23,22 +23,22 @@ dependencies { compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:frontend.java")) - testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":plugins:kapt3-idea")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":idea")) - testCompile(projectTests(":idea:idea-android")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(commonDep("junit:junit")) - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testApi(project(":compiler:cli")) + testApi(project(":compiler:frontend.java")) + testApi(projectTests(":idea:idea-test-framework")) { isTransitive = false } + testApi(project(":plugins:kapt3-idea")) + testApi(projectTests(":compiler:tests-common")) + testApi(projectTests(":idea")) + testApi(projectTests(":idea:idea-android")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(commonDep("junit:junit")) + testApi(project(":idea:idea-native")) { isTransitive = false } + testApi(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) testRuntime(project(":kotlin-reflect")) - testCompile(intellijPluginDep("android")) - testCompile(intellijPluginDep("Groovy")) - testCompile(intellijDep()) + testApi(intellijPluginDep("android")) + testApi(intellijPluginDep("Groovy")) + testApi(intellijDep()) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts index bdbd325a1b7..51cfabb77cf 100644 --- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts @@ -8,7 +8,7 @@ plugins { project.updateJvmTarget("1.6") dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(commonDep("com.google.android", "android")) } diff --git a/plugins/fir/fir-plugin-prototype/build.gradle.kts b/plugins/fir/fir-plugin-prototype/build.gradle.kts index 7bd2f0ef59a..6dadc83052e 100644 --- a/plugins/fir/fir-plugin-prototype/build.gradle.kts +++ b/plugins/fir/fir-plugin-prototype/build.gradle.kts @@ -4,29 +4,29 @@ plugins { } dependencies { - compile(project(":compiler:fir:cones")) - compile(project(":compiler:fir:tree")) - compile(project(":compiler:fir:resolve")) - compile(project(":compiler:fir:checkers")) - compile(project(":compiler:frontend")) + api(project(":compiler:fir:cones")) + api(project(":compiler:fir:tree")) + api(project(":compiler:fir:resolve")) + api(project(":compiler:fir:checkers")) + api(project(":compiler:frontend")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - testCompile(intellijDep()) + testApi(intellijDep()) - testCompile(commonDep("junit:junit")) + testApi(commonDep("junit:junit")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(project(":compiler:fir:checkers")) - testCompile(project(":compiler:fir:checkers:checkers.jvm")) - testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) - testCompile(project(":compiler:frontend")) + testApi(projectTests(":compiler:tests-common")) + testApi(project(":compiler:fir:checkers")) + testApi(project(":compiler:fir:checkers:checkers.jvm")) + testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) + testApi(project(":compiler:frontend")) testCompileOnly(project(":kotlin-reflect-api")) - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":core:descriptors.runtime")) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/plugins/imports-dumper/build.gradle.kts b/plugins/imports-dumper/build.gradle.kts index 724c921f939..a47ae224644 100644 --- a/plugins/imports-dumper/build.gradle.kts +++ b/plugins/imports-dumper/build.gradle.kts @@ -9,13 +9,13 @@ plugins { val kotlinxSerializationVersion = "0.4.2" dependencies { - compile(project(":compiler:frontend.java")) - compile(project(":compiler:plugin-api")) + api(project(":compiler:frontend.java")) + api(project(":compiler:plugin-api")) compileOnly("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", kotlinxSerializationVersion) { isTransitive = false } compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler:tests-common")) embedded("org.jetbrains.kotlinx", "kotlinx-serialization-runtime", kotlinxSerializationVersion) { isTransitive = false } } diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index da745ba8e70..e1f438f6f67 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/plugins/jvm-abi-gen/build.gradle.kts @@ -16,7 +16,7 @@ val shadows: Configuration by configurations.creating { isTransitive = false } configurations.getByName("compileOnly").extendsFrom(shadows) -configurations.getByName("testCompile").extendsFrom(shadows) +configurations.getByName("testApi").extendsFrom(shadows) dependencies { // Should come before compiler dependencies, see comment in "compiler/build.gradle.kts" @@ -38,6 +38,7 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(project(":kotlin-compiler")) testImplementation(commonDep("junit:junit")) diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts index 202296c7b47..c5eedac405a 100644 --- a/plugins/kapt3/kapt3-base/build.gradle.kts +++ b/plugins/kapt3/kapt3-base/build.gradle.kts @@ -4,10 +4,10 @@ plugins { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(toolsJarApi()) - testCompile(commonDep("junit:junit")) + testApi(commonDep("junit:junit")) testCompileOnly(toolsJarApi()) testRuntimeOnly(toolsJar()) diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts index d98e988de6b..cb35ae5cf69 100644 --- a/plugins/kapt3/kapt3-cli/build.gradle.kts +++ b/plugins/kapt3/kapt3-cli/build.gradle.kts @@ -4,13 +4,13 @@ plugins { } dependencies { - compile(project(":compiler:cli")) + api(project(":compiler:cli")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) } - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler")) - testCompile(commonDep("junit:junit")) + testApi(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler")) + testApi(commonDep("junit:junit")) } sourceSets { diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 09f3ba2d28b..36944c1ce76 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -8,18 +8,18 @@ plugins { dependencies { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntime(intellijDep()) + testImplementation(intellijDep()) testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt") } testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } - testRuntime(intellijPluginDep("java")) + testImplementation(intellijPluginDep("java")) - compile(project(":compiler:util")) - compile(project(":compiler:cli")) - compile(project(":compiler:backend")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:plugin-api")) + api(project(":compiler:util")) + api(project(":compiler:cli")) + api(project(":compiler:backend")) + api(project(":compiler:frontend")) + api(project(":compiler:frontend.java")) + api(project(":compiler:plugin-api")) compileOnly(toolsJarApi()) compileOnly(project(":kotlin-annotation-processing-cli")) @@ -28,11 +28,11 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } - testCompile(projectTests(":compiler:tests-common")) - testCompile(project(":kotlin-annotation-processing-base")) - testCompile(projectTests(":kotlin-annotation-processing-base")) - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-annotation-processing-runtime")) + testApi(projectTests(":compiler:tests-common")) + testApi(project(":kotlin-annotation-processing-base")) + testApi(projectTests(":kotlin-annotation-processing-base")) + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-annotation-processing-runtime")) testCompileOnly(toolsJarApi()) testRuntimeOnly(toolsJar()) diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts index f5b1bc83335..cb5bc1a5c6e 100644 --- a/plugins/kapt3/kapt3-runtime/build.gradle.kts +++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) } project.updateJvmTarget("1.6") diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 208a36395bf..2f0cf0f0558 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -19,13 +19,13 @@ dependencies { runtimeOnly(kotlinStdlib()) - testCompile(projectTests(":compiler:tests-common")) + testApi(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-compiler-utils")) testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":generators:test-generator")) - testCompile(commonDep("junit:junit")) + testApi(commonDep("junit:junit")) testApiJUnit5(vintageEngine = true) testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2") diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index f2f41cf9300..71e68eda1c1 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -15,12 +15,12 @@ dependencies { compileOnly(project(":compiler:ir.backend.common")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } - runtime(kotlinStdlib()) + implementation(kotlinStdlib()) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:cli")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:cli")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index c0d65fc353c..21410dfc6e0 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -9,7 +9,7 @@ val robolectricClasspath by configurations.creating val parcelizeRuntimeForTests by configurations.creating dependencies { - testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testApi(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(project(":compiler:util")) compileOnly(project(":compiler:plugin-api")) @@ -22,18 +22,18 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } - testCompile(project(":compiler:util")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:ir.backend.common")) - testCompile(project(":compiler:backend.jvm")) - testCompile(project(":compiler:cli")) - testCompile(project(":plugins:parcelize:parcelize-runtime")) - testCompile(project(":kotlin-android-extensions-runtime")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:util")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:ir.backend.common")) + testApi(project(":compiler:backend.jvm")) + testApi(project(":compiler:cli")) + testApi(project(":plugins:parcelize:parcelize-runtime")) + testApi(project(":kotlin-android-extensions-runtime")) + testApi(projectTests(":compiler:tests-common")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(commonDep("junit:junit")) - testRuntime(intellijPluginDep("junit")) + testRuntimeOnly(intellijPluginDep("junit")) robolectricClasspath(commonDep("org.robolectric", "robolectric")) robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1") diff --git a/plugins/parcelize/parcelize-ide/build.gradle.kts b/plugins/parcelize/parcelize-ide/build.gradle.kts index ba7ee0debd1..ec1a4eda3a7 100644 --- a/plugins/parcelize/parcelize-ide/build.gradle.kts +++ b/plugins/parcelize/parcelize-ide/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { compile(intellijPluginDep("gradle")) compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - testCompile(projectTests(":idea")) - testCompile(projectTests(":plugins:parcelize:parcelize-compiler")) + testApi(projectTests(":idea")) + testApi(projectTests(":plugins:parcelize:parcelize-compiler")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) diff --git a/plugins/parcelize/parcelize-runtime/build.gradle.kts b/plugins/parcelize/parcelize-runtime/build.gradle.kts index 0ee2666400c..82932e9095b 100644 --- a/plugins/parcelize/parcelize-runtime/build.gradle.kts +++ b/plugins/parcelize/parcelize-runtime/build.gradle.kts @@ -8,8 +8,8 @@ plugins { project.updateJvmTarget("1.6") dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-android-extensions-runtime")) + api(kotlinStdlib()) + api(project(":kotlin-android-extensions-runtime")) compileOnly(commonDep("com.google.android", "android")) } diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts index 9c7982f47be..17cbaf32f71 100644 --- a/plugins/pill/generate-all-tests/build.gradle.kts +++ b/plugins/pill/generate-all-tests/build.gradle.kts @@ -18,7 +18,7 @@ val depenencyProjects = arrayOf( dependencies { depenencyProjects.forEach { - testCompile(projectTests(it)) + testApi(projectTests(it)) jpsTest(project(it, configuration = "jpsTest")) } 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 55bba0cd277..d3e366cf832 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 @@ -12,13 +12,13 @@ dependencies { compileOnly(project(":compiler:plugin-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:cli")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:backend")) + testApi(project(":compiler:cli")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) testCompileOnly(project(":kotlin-compiler")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(project(":kotlin-scripting-jvm-host-unshaded")) + testApi(project(":kotlin-scripting-jvm-host-unshaded")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } } diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index cacbf5cf41c..589dbb2271b 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -13,9 +13,9 @@ dependencies { compileOnly(project(":compiler:plugin-api")) compileOnly(project(":compiler:cli")) compileOnly(project(":compiler:ir.serialization.js")) - compile(project(":kotlin-scripting-common")) - compile(project(":kotlin-scripting-jvm")) - compile(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-jvm")) + api(kotlinStdlib()) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } @@ -25,14 +25,14 @@ dependencies { runtimeOnly(project(":kotlin-reflect")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:plugin-api")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":compiler:frontend.java")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:frontend")) + testApi(project(":compiler:plugin-api")) + testApi(project(":compiler:util")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:cli-common")) + testApi(project(":compiler:frontend.java")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) } sourceSets { diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 59ba44779fe..2265870ad60 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -16,23 +16,23 @@ dependencies { compileOnly(project(":compiler:ir.tree.impl")) compileOnly(project(":compiler:backend.jvm.entrypoint")) compileOnly(project(":kotlin-reflect-api")) - compile(project(":kotlin-scripting-common")) - compile(project(":kotlin-scripting-js")) - compile(project(":kotlin-util-klib")) - compile(project(":kotlin-scripting-jvm")) - compile(project(":kotlin-scripting-compiler-impl")) - compile(kotlinStdlib()) + api(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-js")) + api(project(":kotlin-util-klib")) + api(project(":kotlin-scripting-jvm")) + api(project(":kotlin-scripting-compiler-impl")) + api(kotlinStdlib()) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:plugin-api")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":compiler:frontend.java")) - testCompile(project(":compiler:backend.js")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(commonDep("junit:junit")) + testApi(project(":compiler:frontend")) + testApi(project(":compiler:plugin-api")) + testApi(project(":compiler:util")) + testApi(project(":compiler:cli")) + testApi(project(":compiler:cli-common")) + testApi(project(":compiler:frontend.java")) + testApi(project(":compiler:backend.js")) + testApi(projectTests(":compiler:tests-common")) + testApi(commonDep("junit:junit")) testImplementation(intellijCoreDep()) { includeJars("intellij-core") } testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts index 0600ed44300..58bbec52c7c 100644 --- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts @@ -6,8 +6,10 @@ plugins { project.updateJvmTarget("1.8") val allTestsRuntime by configurations.creating -val testCompile by configurations -testCompile.extendsFrom(allTestsRuntime) + +val testApi by configurations +testApi.extendsFrom(allTestsRuntime) + val embeddableTestRuntime by configurations.creating { extendsFrom(allTestsRuntime) attributes { @@ -18,11 +20,11 @@ val embeddableTestRuntime by configurations.creating { dependencies { allTestsRuntime(commonDep("junit")) - testCompile(kotlinStdlib("jdk8")) - testCompile(project(":kotlin-scripting-ide-services-unshaded")) - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":kotlin-scripting-dependencies-maven")) - testCompile(project(":compiler:cli")) + testApi(kotlinStdlib("jdk8")) + testApi(project(":kotlin-scripting-ide-services-unshaded")) + testApi(project(":kotlin-scripting-compiler")) + testApi(project(":kotlin-scripting-dependencies-maven")) + testApi(project(":compiler:cli")) testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm")) @@ -30,9 +32,9 @@ dependencies { testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) testRuntimeOnly(project(":kotlin-scripting-ide-common")) { isTransitive = false } - embeddableTestRuntime(project(":kotlin-scripting-ide-services", configuration="runtimeElements")) - embeddableTestRuntime(project(":kotlin-scripting-compiler-impl-embeddable", configuration="runtimeElements")) - embeddableTestRuntime(project(":kotlin-scripting-dependencies", configuration="runtimeElements")) + embeddableTestRuntime(project(":kotlin-scripting-ide-services")) + embeddableTestRuntime(project(":kotlin-scripting-compiler-impl-embeddable")) + embeddableTestRuntime(project(":kotlin-scripting-dependencies")) embeddableTestRuntime(project(":kotlin-scripting-dependencies-maven-all")) embeddableTestRuntime(kotlinStdlib("jdk8")) embeddableTestRuntime(testSourceSet.output) diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts index ce30f6acaa1..6776c953ece 100644 --- a/plugins/scripting/scripting-ide-services/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services/build.gradle.kts @@ -11,11 +11,11 @@ project.updateJvmTarget("1.8") publish() dependencies { - compile(project(":kotlin-script-runtime")) - compile(kotlinStdlib()) + api(project(":kotlin-script-runtime")) + api(kotlinStdlib()) compileOnly(project(":kotlin-scripting-ide-common")) - compile(project(":kotlin-scripting-common")) - compile(project(":kotlin-scripting-jvm")) + api(project(":kotlin-scripting-common")) + api(project(":kotlin-scripting-jvm")) compileOnly(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli")) compileOnly(project(":kotlin-reflect-api")) diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 53c7e93063b..bba9e305115 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -19,13 +19,13 @@ dependencies { embedded(project(":daemon-common-new")) { isTransitive = false } embedded(projectRuntimeJar(":kotlin-daemon-client")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":daemon-common")) - testCompile(project(":daemon-common-new")) - testCompile(projectRuntimeJar(":kotlin-daemon-client")) - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(project(":kotlin-test:kotlin-test-junit")) + testApi(project(":compiler:cli-common")) + testApi(project(":daemon-common")) + testApi(project(":daemon-common-new")) + testApi(projectRuntimeJar(":kotlin-daemon-client")) + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-jvm")) + testApi(project(":kotlin-test:kotlin-test-junit")) testCompilerClasspath(project(":kotlin-compiler")) testCompilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j")) testCompilerClasspath(project(":kotlin-scripting-compiler")) diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index d573eaf6bc7..4c693becc44 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -29,8 +29,8 @@ dependencies { Platform[203].orHigher { runtimeOnly(commonDep("net.java.dev.jna", "jna")) } - testCompile(commonDep("junit:junit")) - testCompile(project(":kotlin-test:kotlin-test-junit")) + testApi(commonDep("junit:junit")) + testApi(project(":kotlin-test:kotlin-test-junit")) testCompilationClasspath(kotlinStdlib()) } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 4babd134d8d..613fd25338b 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -8,7 +8,7 @@ description = "Kotlin Compiler" plugins { // HACK: java plugin makes idea import dependencies on this project as source (with empty sources however), // this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules - java + `java-library` } @@ -38,9 +38,9 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { } } -val compile by configurations // maven plugin writes pom compile scope from compile configuration by default +val api by configurations val proguardLibraries by configurations.creating { - extendsFrom(compile) + extendsFrom(api) } // Libraries to copy to the lib directory @@ -135,10 +135,10 @@ configurations.all { } dependencies { - compile(kotlinStdlib()) - compile(project(":kotlin-script-runtime")) - compile(project(":kotlin-reflect")) - compile(commonDep("org.jetbrains.intellij.deps", "trove4j")) + api(kotlinStdlib()) + api(project(":kotlin-script-runtime")) + api(project(":kotlin-reflect")) + api(commonDep("org.jetbrains.intellij.deps", "trove4j")) proguardLibraries(project(":kotlin-annotations-jvm")) diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts index 3b7d8d0cb87..aea94c978e0 100644 --- a/test-instrumenter/build.gradle.kts +++ b/test-instrumenter/build.gradle.kts @@ -12,7 +12,7 @@ pill { } dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) } }