From 4aa3040550babaf8fcc324c8a407e4ed4ce357a3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 27 Apr 2020 17:42:38 +0300 Subject: [PATCH] Build: Use runtimeOnly instead of deprecated runtime maven-publish plugin uses `runtimeOnly` for runtime scope instead of `runtime` --- compiler/cli/cli-js-klib/build.gradle.kts | 2 +- compiler/daemon/build.gradle.kts | 4 ++-- compiler/daemon/daemon-client/build.gradle.kts | 4 ++-- .../jvm-debugger-test/build.gradle.kts | 1 + .../scripting/jsr223-embeddable/build.gradle.kts | 14 +++++++------- .../scripting/jvm-host-embeddable/build.gradle.kts | 12 ++++++------ .../kotlin-annotation-processing/build.gradle.kts | 4 ++-- .../tools/kotlin-gradle-plugin/build.gradle.kts | 14 +++++++------- libraries/tools/kotlin-main-kts/build.gradle.kts | 8 ++++---- .../tools/kotlin-test-js-runner/build.gradle.kts | 2 +- .../new-project-wizard-cli/build.gradle.kts | 1 + native/commonizer-embeddable/build.gradle.kts | 4 ++-- plugins/allopen/allopen-cli/build.gradle.kts | 2 +- .../kotlin-serialization-compiler/build.gradle.kts | 2 +- .../scripting-compiler-embeddable/build.gradle.kts | 4 ++-- .../build.gradle.kts | 8 ++++---- .../scripting-compiler-impl/build.gradle.kts | 2 +- .../build.gradle.kts | 12 ++++++------ .../build.gradle.kts | 2 +- prepare/compiler-embeddable/build.gradle.kts | 8 ++++---- 20 files changed, 56 insertions(+), 54 deletions(-) diff --git a/compiler/cli/cli-js-klib/build.gradle.kts b/compiler/cli/cli-js-klib/build.gradle.kts index 4e0ee17d0a6..95459ea60cf 100644 --- a/compiler/cli/cli-js-klib/build.gradle.kts +++ b/compiler/cli/cli-js-klib/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { compile(project(":compiler:cli")) compile(project(":compiler:ir.serialization.js")) - runtime(project(":kotlin-reflect")) + runtimeOnly(project(":kotlin-reflect")) if (Platform[193].orLower()) { compile(intellijDep()) { includeJars("picocontainer", rootProject = rootProject) } } diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 5260daabb4c..02797935cbc 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -19,10 +19,10 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j") } - runtime(project(":kotlin-reflect")) + runtimeOnly(project(":kotlin-reflect")) embedded(project(":daemon-common")) { isTransitive = false } - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts index e9217983b1c..47026bd22a8 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts +++ b/compiler/daemon/daemon-client/build.gradle.kts @@ -32,8 +32,8 @@ dependencies { nativePlatformVariants.forEach { embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it")) } - runtime(project(":kotlin-reflect")) - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { + runtimeOnly(project(":kotlin-reflect")) + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index 6be6246792c..e9ff13bca8a 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -5,6 +5,7 @@ plugins { dependencies { testCompileOnly(intellijDep()) + testCompileOnly(project(":kotlin-reflect-api")) testCompile(project(":idea:jvm-debugger:jvm-debugger-core")) testCompile(project(":idea:jvm-debugger:jvm-debugger-evaluation")) diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts index c3b4f1ce08d..b1d7ada9207 100644 --- a/libraries/scripting/jsr223-embeddable/build.gradle.kts +++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts @@ -10,13 +10,13 @@ val packedJars by configurations.creating dependencies { packedJars(project(":kotlin-scripting-jsr223-unshaded")) { isTransitive = false } - runtime(project(":kotlin-script-runtime")) - runtime(kotlinStdlib()) - runtime(project(":kotlin-scripting-common")) - runtime(project(":kotlin-scripting-jvm")) - runtime(project(":kotlin-scripting-jvm-host")) - runtime(project(":kotlin-compiler-embeddable")) - runtime(project(":kotlin-scripting-compiler-embeddable")) + runtimeOnly(project(":kotlin-script-runtime")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(project(":kotlin-scripting-common")) + runtimeOnly(project(":kotlin-scripting-jvm")) + runtimeOnly(project(":kotlin-scripting-jvm-host")) + runtimeOnly(project(":kotlin-compiler-embeddable")) + runtimeOnly(project(":kotlin-scripting-compiler-embeddable")) } sourceSets { diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index dbf920a4cbf..b666cff5e60 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -6,12 +6,12 @@ plugins { java } dependencies { embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false } - runtime(project(":kotlin-script-runtime")) - runtime(kotlinStdlib()) - runtime(project(":kotlin-scripting-common")) - runtime(project(":kotlin-scripting-jvm")) - runtime(project(":kotlin-compiler-embeddable")) - runtime(project(":kotlin-scripting-compiler-embeddable")) + runtimeOnly(project(":kotlin-script-runtime")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(project(":kotlin-scripting-common")) + runtimeOnly(project(":kotlin-scripting-jvm")) + runtimeOnly(project(":kotlin-compiler-embeddable")) + runtimeOnly(project(":kotlin-scripting-compiler-embeddable")) } sourceSets { diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index c67f1234341..1ec4fcbc29b 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -10,9 +10,9 @@ plugins { val packedJars by configurations.creating dependencies { - compile(kotlinStdlib()) + api(kotlinStdlib()) packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } - runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) } projectTest(parallel = true) { diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 678eb90dd76..9747286c2b6 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -60,13 +60,13 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) - runtime(projectRuntimeJar(":kotlin-annotation-processing-gradle")) - runtime(projectRuntimeJar(":kotlin-android-extensions")) - runtime(projectRuntimeJar(":kotlin-compiler-runner")) - runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) - runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable")) - runtime(project(":kotlin-reflect")) + runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtimeOnly(projectRuntimeJar(":kotlin-annotation-processing-gradle")) + runtimeOnly(projectRuntimeJar(":kotlin-android-extensions")) + runtimeOnly(projectRuntimeJar(":kotlin-compiler-runner")) + runtimeOnly(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + runtimeOnly(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable")) + runtimeOnly(project(":kotlin-reflect")) jarContents(compileOnly(intellijDep()) { includeJars("asm-all", "gson", "serviceMessages", rootProject = rootProject) diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index b1cec599a11..2adad280b63 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -29,10 +29,10 @@ dependencies { compileOnly(project(":compiler:cli-common")) compileOnly(project(":kotlin-scripting-jvm-host-unshaded")) compileOnly(project(":kotlin-scripting-dependencies")) - runtime(project(":kotlin-compiler-embeddable")) - runtime(project(":kotlin-scripting-compiler-embeddable")) - runtime(project(":kotlin-scripting-jvm-host")) - runtime(project(":kotlin-reflect")) + runtimeOnly(project(":kotlin-compiler-embeddable")) + runtimeOnly(project(":kotlin-scripting-compiler-embeddable")) + runtimeOnly(project(":kotlin-scripting-jvm-host")) + runtimeOnly(project(":kotlin-reflect")) embedded(project(":kotlin-scripting-common")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false } diff --git a/libraries/tools/kotlin-test-js-runner/build.gradle.kts b/libraries/tools/kotlin-test-js-runner/build.gradle.kts index db36529d9cf..a70375a3aac 100644 --- a/libraries/tools/kotlin-test-js-runner/build.gradle.kts +++ b/libraries/tools/kotlin-test-js-runner/build.gradle.kts @@ -96,4 +96,4 @@ artifacts { } } -publish() \ No newline at end of file +publishWithLegacyMavenPlugin() \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/build.gradle.kts index da6371c9b59..8281b8f9703 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { testImplementation(projectTests(":compiler:tests-common")) testImplementation(project(":kotlin-test:kotlin-test-junit")) + testImplementation(project(":kotlin-reflect")) testImplementation(commonDep("junit:junit")) testImplementation(intellijDep()) } diff --git a/native/commonizer-embeddable/build.gradle.kts b/native/commonizer-embeddable/build.gradle.kts index a0d4a779e31..1b29e79d792 100644 --- a/native/commonizer-embeddable/build.gradle.kts +++ b/native/commonizer-embeddable/build.gradle.kts @@ -6,8 +6,8 @@ plugins { dependencies { embedded(project(":native:kotlin-klib-commonizer")) { isTransitive = false } - runtime(kotlinStdlib()) - runtime(project(":kotlin-compiler-embeddable")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(project(":kotlin-compiler-embeddable")) } sourceSets { diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index 740183fe6b0..7045eca1ac3 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compileOnly(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - runtime(kotlinStdlib()) + runtimeOnly(kotlinStdlib()) testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 53f29ce4275..dedd76e52d4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compileOnly(project(":js:js.translator")) compileOnly(project(":kotlin-util-klib-metadata")) - runtime(kotlinStdlib()) + runtimeOnly(kotlinStdlib()) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts index 7a439389614..c6f9042b654 100644 --- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts @@ -7,8 +7,8 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler" val packedJars by configurations.creating dependencies { packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false } - runtime(project(":kotlin-scripting-compiler-impl-embeddable")) - runtime(kotlinStdlib()) + runtimeOnly(project(":kotlin-scripting-compiler-impl-embeddable")) + runtimeOnly(kotlinStdlib()) } publish() diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts index 4a564c34027..8fa135b27d4 100644 --- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts @@ -7,10 +7,10 @@ description = "Kotlin Compiler Infrastructure for Scripting for embeddable compi val packedJars by configurations.creating dependencies { packedJars(project(":kotlin-scripting-compiler-impl")) { isTransitive = false } - runtime(project(":kotlin-scripting-common")) - runtime(project(":kotlin-scripting-jvm")) - runtime(kotlinStdlib()) - runtime(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + runtimeOnly(project(":kotlin-scripting-common")) + runtimeOnly(project(":kotlin-scripting-jvm")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } publish() diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index caf225de6b7..df65eaff1e3 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { // FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core compileOnly(intellijDep()) { includeJars("platform-api") } - runtime(project(":kotlin-reflect")) + runtimeOnly(project(":kotlin-reflect")) testCompile(project(":compiler:frontend")) testCompile(project(":compiler:plugin-api")) diff --git a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts index 9bd7ac9dd00..87ab721485d 100644 --- a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts @@ -5,12 +5,12 @@ plugins { java } dependencies { embedded(project(":kotlin-scripting-ide-services-unshaded")) { isTransitive = false } embedded(project(":idea:ide-common")) { isTransitive = false } - runtime(project(":kotlin-script-runtime")) - runtime(kotlinStdlib()) - runtime(project(":kotlin-scripting-common")) - runtime(project(":kotlin-scripting-jvm")) - runtime(project(":kotlin-compiler-embeddable")) - runtime(project(":kotlin-scripting-compiler-embeddable")) + runtimeOnly(project(":kotlin-script-runtime")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(project(":kotlin-scripting-common")) + runtimeOnly(project(":kotlin-scripting-jvm")) + runtimeOnly(project(":kotlin-compiler-embeddable")) + runtimeOnly(project(":kotlin-scripting-compiler-embeddable")) } sourceSets { diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index 646b893b209..4d10c88b276 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(project(":compiler:frontend.java")) compileOnly(project(":compiler:backend")) compileOnly(project(":kotlin-android-extensions-runtime")) - runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) compileOnly(commonDep("com.google.android", "android")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 986d64b7369..25bcdd7fd5c 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -8,11 +8,11 @@ plugins { val testCompilationClasspath by configurations.creating dependencies { - runtime(kotlinStdlib()) - runtime(project(":kotlin-script-runtime")) - runtime(project(":kotlin-reflect")) + runtimeOnly(kotlinStdlib()) + runtimeOnly(project(":kotlin-script-runtime")) + runtimeOnly(project(":kotlin-reflect")) runtime(project(":kotlin-daemon-embeddable")) - runtime(commonDep("org.jetbrains.intellij.deps", "trove4j")) + runtimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j")) testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompilationClasspath(kotlinStdlib())