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

[Interop] Add dependency on kotlinx-metadata-klib

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-11-14 18:56:04 +07:00
committed by Sergey Bogolepov
parent f25b4bf75f
commit 2e22d5a389
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+9 -1
View File
@@ -102,6 +102,9 @@ allprojects {
maven {
url kotlinCompilerRepo
}
maven {
url "https://dl.bintray.com/kotlin/kotlin-dev"
}
}
setupHostAndTarget()
@@ -266,6 +269,11 @@ task detectJarCollision(type: CollisionDetector) {
resolvingRules["META-INF/metadata.kotlin_module"] = "kotlin-compiler"
resolvingRules["META-INF/type-system.kotlin_module"] = "kotlin-compiler"
resolvingRules["META-INF/util.runtime.kotlin_module"] = "kotlin-compiler"
// These collisions are introduced by kotlinx-metadata-klib.
resolvingRules["META-INF/serialization.kotlin_module"] = "kotlin-compiler"
resolvingRules["META-INF/kotlin-util-klib-metadata.kotlin_module"] = "kotlin-compiler"
resolvingRules["kotlin/annotation/annotation.kotlin_builtins"] = "kotlin-compiler"
resolvingRules["kotlin/collections/collections.kotlin_builtins"] = "kotlin-compiler"
resolvingRules["kotlin/coroutines/coroutines.kotlin_builtins"] = "kotlin-compiler"
@@ -275,7 +283,7 @@ task detectJarCollision(type: CollisionDetector) {
resolvingRules["kotlin/reflect/reflect.kotlin_builtins"] = "kotlin-compiler"
resolvingRules["META-INF/maven/com.google.protobuf/protobuf-java/pom.properties"] = "kotlin-compiler"
resolvingRules["META-INF/maven/com.google.protobuf/protobuf-java/pom.xml"] = "kotlin-compiler"
librariesWithIgnoredClassCollisions.addAll(["kotlin-util-klib", "kotlin-util-io"])
librariesWithIgnoredClassCollisions.addAll(["kotlin-util-klib", "kotlin-util-io", "kotlinx-metadata-klib"])
if (project.hasProperty('kotlinProjectPath')) {
resolvingRulesWithRegexes[new Regex("META-INF/.+\\.kotlin_module")] = "kotlin-compiler"
resolvingRules["META-INF/extensions/compiler.xml"] = "kotlin-compiler"