diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index 12cc0b67141..ac2af37bd07 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -113,6 +113,11 @@ kotlinNativeInterop { configurations { + compilerApi { + extendsFrom kotlinNativeInterop['llvm'].configuration + extendsFrom kotlinNativeInterop['files'].configuration + extendsFrom kotlinNativeInterop['env'].configuration + } kotlin_compiler_jar kotlin_stdlib_jar kotlin_reflect_jar @@ -161,11 +166,6 @@ dependencies { compileOnly(jpsModel()) } - compilerApi kotlinNativeInterop['llvm'].configuration - compilerApi kotlinNativeInterop['files'].configuration - compilerApi kotlinNativeInterop['env'].configuration - - cli_bcApi sourceSets.compiler.output cli_bcApiElements sourceSets.cli_bc.output diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 5a8be41dcf1..10d7fb16023 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -22,10 +22,12 @@ val proguardLibraryJars by configurations.creating { } } -val relocatedJarContents by configurations.creating - val embedded by configurations +val relocatedJarContents by configurations.creating { + extendsFrom(embedded) +} + dependencies { compileOnly(project(":compiler:cli-common")) compileOnly(project(":kotlin-scripting-jvm-host-unshaded")) @@ -50,7 +52,6 @@ dependencies { proguardLibraryJars(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } proguardLibraryJars(project(":kotlin-compiler")) - relocatedJarContents(embedded) relocatedJarContents(mainSourceSet.output) }