From 6afceb1e8430b4cb2228a05ac21bcbaaf4bd20bd Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 11 Oct 2022 13:13:58 +0200 Subject: [PATCH] Remove more usages for embedded with isTransitive = true It's a refactoring because the list of dependencies shouldn't change Follow up for KTI-942 --- libraries/reflect/build.gradle.kts | 28 +++++++++---------- libraries/tools/atomicfu/build.gradle.kts | 2 +- .../kotlin-gradle-plugin-api/build.gradle.kts | 2 +- .../tools/kotlin-main-kts/build.gradle.kts | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 021ef536c68..b773f9d66e2 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -41,20 +41,20 @@ dependencies { proguardDeps(kotlinStdlib()) proguardAdditionalInJars(project(":kotlin-annotations-jvm")) - embedded(project(":kotlin-reflect-api")) - embedded(project(":core:metadata")) - embedded(project(":core:metadata.jvm")) - embedded(project(":core:compiler.common")) - embedded(project(":core:compiler.common.jvm")) - embedded(project(":core:deserialization.common")) - embedded(project(":core:deserialization.common.jvm")) - embedded(project(":core:descriptors")) - embedded(project(":core:descriptors.jvm")) - embedded(project(":core:deserialization")) - embedded(project(":core:descriptors.runtime")) - embedded(project(":core:util.runtime")) - embedded("javax.inject:javax.inject:1") - embedded(protobufLite()) + embedded(project(":kotlin-reflect-api")) { isTransitive = false } + embedded(project(":core:metadata")) { isTransitive = false } + embedded(project(":core:metadata.jvm")) { isTransitive = false } + embedded(project(":core:compiler.common")) { isTransitive = false } + embedded(project(":core:compiler.common.jvm")) { isTransitive = false } + embedded(project(":core:deserialization.common")) { isTransitive = false } + embedded(project(":core:deserialization.common.jvm")) { isTransitive = false } + embedded(project(":core:descriptors")) { isTransitive = false } + embedded(project(":core:descriptors.jvm")) { isTransitive = false } + embedded(project(":core:deserialization")) { isTransitive = false } + embedded(project(":core:descriptors.runtime")) { isTransitive = false } + embedded(project(":core:util.runtime")) { isTransitive = false } + embedded("javax.inject:javax.inject:1") { isTransitive = false } + embedded(protobufLite()) { isTransitive = false } compileOnly("org.jetbrains:annotations:13.0") } diff --git a/libraries/tools/atomicfu/build.gradle.kts b/libraries/tools/atomicfu/build.gradle.kts index 353f403e068..844e5911196 100644 --- a/libraries/tools/atomicfu/build.gradle.kts +++ b/libraries/tools/atomicfu/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { compileOnly(project(":kotlin-gradle-plugin")) compileOnly(project(":kotlin-compiler-embeddable")) - embedded(project(":kotlinx-atomicfu-compiler-plugin")) + embedded(project(":kotlinx-atomicfu-compiler-plugin")) { isTransitive = false } } gradlePlugin { diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 7dd278ec9b1..3ea320050ee 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -19,5 +19,5 @@ dependencies { isTransitive = false } - embedded(project(":kotlin-gradle-compiler-types")) + embedded(project(":kotlin-gradle-compiler-types")) { isTransitive = false } } diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 374f218497e..f1931fbe435 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { embedded(project(":kotlin-scripting-common")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false } - embedded(project(":kotlin-scripting-dependencies-maven-all")) + embedded(project(":kotlin-scripting-dependencies-maven-all")) { isTransitive = false } embedded("org.slf4j:slf4j-nop:1.7.30") embedded(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false