azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Use embedded configuration in kotlin-reflect

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-04-18 22:40:46 +03:00
parent a6e3a0f5c3
commit c672300da1
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/reflect/build.gradle.kts
+17 -16
View File
@@ -40,10 +40,11 @@ val libsDir = property("libsDir")
val proguardDeps by configurations.creating val proguardDeps by configurations.creating
val proguardAdditionalInJars by configurations.creating val proguardAdditionalInJars by configurations.creating
val shadows by configurations.creating {
isTransitive = false val embedded by configurations
} embedded.isTransitive = false
configurations.getByName("compileOnly").extendsFrom(shadows)
configurations.getByName("compileOnly").extendsFrom(embedded)
val mainJar by configurations.creating val mainJar by configurations.creating
dependencies { dependencies {
@@ -53,17 +54,17 @@ dependencies {
proguardAdditionalInJars(project(":kotlin-annotations-jvm")) proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String)))) proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))
shadows(project(":core:type-system")) embedded(project(":core:type-system"))
shadows(project(":kotlin-reflect-api")) embedded(project(":kotlin-reflect-api"))
shadows(project(":core:metadata")) embedded(project(":core:metadata"))
shadows(project(":core:metadata.jvm")) embedded(project(":core:metadata.jvm"))
shadows(project(":core:descriptors")) embedded(project(":core:descriptors"))
shadows(project(":core:descriptors.jvm")) embedded(project(":core:descriptors.jvm"))
shadows(project(":core:deserialization")) embedded(project(":core:deserialization"))
shadows(project(":core:descriptors.runtime")) embedded(project(":core:descriptors.runtime"))
shadows(project(":core:util.runtime")) embedded(project(":core:util.runtime"))
shadows("javax.inject:javax.inject:1") embedded("javax.inject:javax.inject:1")
shadows(protobufLite()) embedded(protobufLite())
compileOnly("org.jetbrains:annotations:13.0") compileOnly("org.jetbrains:annotations:13.0")
} }
@@ -118,7 +119,7 @@ val reflectShadowJar by task<ShadowJar> {
transform(KotlinModuleShadowTransformer(logger)) transform(KotlinModuleShadowTransformer(logger))
configurations = listOf(shadows) configurations = listOf(embedded)
relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl") relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl")
relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject") relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject")
mergeServiceFiles() mergeServiceFiles()