Build: Replace configuration dependencies with extends
Configuration dependencies on configuration are not allowed in Gradle 8
This commit is contained in:
committed by
Space Team
parent
fae4cbb415
commit
bd9f096cfd
@@ -113,6 +113,11 @@ kotlinNativeInterop {
|
|||||||
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
|
compilerApi {
|
||||||
|
extendsFrom kotlinNativeInterop['llvm'].configuration
|
||||||
|
extendsFrom kotlinNativeInterop['files'].configuration
|
||||||
|
extendsFrom kotlinNativeInterop['env'].configuration
|
||||||
|
}
|
||||||
kotlin_compiler_jar
|
kotlin_compiler_jar
|
||||||
kotlin_stdlib_jar
|
kotlin_stdlib_jar
|
||||||
kotlin_reflect_jar
|
kotlin_reflect_jar
|
||||||
@@ -161,11 +166,6 @@ dependencies {
|
|||||||
compileOnly(jpsModel())
|
compileOnly(jpsModel())
|
||||||
}
|
}
|
||||||
|
|
||||||
compilerApi kotlinNativeInterop['llvm'].configuration
|
|
||||||
compilerApi kotlinNativeInterop['files'].configuration
|
|
||||||
compilerApi kotlinNativeInterop['env'].configuration
|
|
||||||
|
|
||||||
|
|
||||||
cli_bcApi sourceSets.compiler.output
|
cli_bcApi sourceSets.compiler.output
|
||||||
|
|
||||||
cli_bcApiElements sourceSets.cli_bc.output
|
cli_bcApiElements sourceSets.cli_bc.output
|
||||||
|
|||||||
@@ -22,10 +22,12 @@ val proguardLibraryJars by configurations.creating {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val relocatedJarContents by configurations.creating
|
|
||||||
|
|
||||||
val embedded by configurations
|
val embedded by configurations
|
||||||
|
|
||||||
|
val relocatedJarContents by configurations.creating {
|
||||||
|
extendsFrom(embedded)
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":compiler:cli-common"))
|
compileOnly(project(":compiler:cli-common"))
|
||||||
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||||
@@ -50,7 +52,6 @@ dependencies {
|
|||||||
proguardLibraryJars(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
proguardLibraryJars(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
proguardLibraryJars(project(":kotlin-compiler"))
|
proguardLibraryJars(project(":kotlin-compiler"))
|
||||||
|
|
||||||
relocatedJarContents(embedded)
|
|
||||||
relocatedJarContents(mainSourceSet.output)
|
relocatedJarContents(mainSourceSet.output)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user