Build: Use embedded configuration in kotlin-reflect
This commit is contained in:
@@ -40,10 +40,11 @@ val libsDir = property("libsDir")
|
||||
|
||||
val proguardDeps by configurations.creating
|
||||
val proguardAdditionalInJars by configurations.creating
|
||||
val shadows by configurations.creating {
|
||||
isTransitive = false
|
||||
}
|
||||
configurations.getByName("compileOnly").extendsFrom(shadows)
|
||||
|
||||
val embedded by configurations
|
||||
embedded.isTransitive = false
|
||||
|
||||
configurations.getByName("compileOnly").extendsFrom(embedded)
|
||||
val mainJar by configurations.creating
|
||||
|
||||
dependencies {
|
||||
@@ -53,17 +54,17 @@ dependencies {
|
||||
proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
|
||||
proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
|
||||
|
||||
shadows(project(":core:type-system"))
|
||||
shadows(project(":kotlin-reflect-api"))
|
||||
shadows(project(":core:metadata"))
|
||||
shadows(project(":core:metadata.jvm"))
|
||||
shadows(project(":core:descriptors"))
|
||||
shadows(project(":core:descriptors.jvm"))
|
||||
shadows(project(":core:deserialization"))
|
||||
shadows(project(":core:descriptors.runtime"))
|
||||
shadows(project(":core:util.runtime"))
|
||||
shadows("javax.inject:javax.inject:1")
|
||||
shadows(protobufLite())
|
||||
embedded(project(":core:type-system"))
|
||||
embedded(project(":kotlin-reflect-api"))
|
||||
embedded(project(":core:metadata"))
|
||||
embedded(project(":core:metadata.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())
|
||||
|
||||
compileOnly("org.jetbrains:annotations:13.0")
|
||||
}
|
||||
@@ -118,7 +119,7 @@ val reflectShadowJar by task<ShadowJar> {
|
||||
|
||||
transform(KotlinModuleShadowTransformer(logger))
|
||||
|
||||
configurations = listOf(shadows)
|
||||
configurations = listOf(embedded)
|
||||
relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")
|
||||
relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject")
|
||||
mergeServiceFiles()
|
||||
|
||||
Reference in New Issue
Block a user