Don't include kotlin-native-utils.jar into fat kotlin-native.jar
(cherry picked from commit c23811b602a5889afa673728eadec570a1ff7566)
This commit is contained in:
committed by
Vasily Levchenko
parent
cc8b07543a
commit
d3c175a152
@@ -129,7 +129,6 @@ configurations {
|
||||
kotlin_stdlib_jar
|
||||
kotlin_reflect_jar
|
||||
kotlin_script_runtime_jar
|
||||
kotlin_native_utils_jar
|
||||
trove4j_jar
|
||||
kotlinCommonSources
|
||||
|
||||
@@ -149,7 +148,6 @@ dependencies {
|
||||
kotlin_stdlib_jar "$kotlinStdLibModule@jar"
|
||||
kotlin_reflect_jar "$kotlinReflectModule@jar"
|
||||
kotlin_script_runtime_jar "$kotlinScriptRuntimeModule@jar"
|
||||
kotlin_native_utils_jar "$kotlinNativeUtilsModule@jar"
|
||||
|
||||
[kotlinCommonStdlibModule, kotlinTestCommonModule, kotlinTestAnnotationsCommonModule].each {
|
||||
kotlinCommonSources(it) { transitive = false }
|
||||
@@ -250,7 +248,7 @@ jar {
|
||||
dependsOn ':runtime:hostRuntime', 'external_jars'
|
||||
}
|
||||
|
||||
def externalJars = ['compiler', 'stdlib', 'reflect', 'script_runtime', 'native_utils']
|
||||
def externalJars = ['compiler', 'stdlib', 'reflect', 'script_runtime']
|
||||
|
||||
task trove4jCopy(type: Copy) {
|
||||
from configurations.getByName("trove4j_jar") {
|
||||
|
||||
+1
-2
@@ -89,7 +89,6 @@ ext {
|
||||
kotlinTestAnnotationsCommonModule="org.jetbrains.kotlin:kotlin-test-annotations-common:${kotlinStdlibVersion}:sources"
|
||||
kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
|
||||
kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
|
||||
kotlinNativeUtilsModule="org.jetbrains.kotlin:kotlin-native-utils:${kotlinVersion}"
|
||||
kotlinUtilKliMetadatabModule="org.jetbrains.kotlin:kotlin-util-klib-metadata:${kotlinVersion}"
|
||||
|
||||
konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
|
||||
@@ -299,7 +298,7 @@ task detectJarCollision(type: CollisionDetector) {
|
||||
resolvingRules["org/jetbrains/kotlin/builtins/konan/KonanBuiltIns.class"] = "kotlin-compiler"
|
||||
resolvingRules["org/jetbrains/kotlin/resolve/konan/platform/NativeInliningRule.class"] = "kotlin-compiler"
|
||||
resolvingRules["org/jetbrains/kotlin/resolve/konan/platform/NativePlatformAnalyzerServices.class"] = "kotlin-compiler"
|
||||
librariesWithIgnoredClassCollisions.addAll(["kotlin-util-klib", "kotlin-util-io", "kotlinx-metadata-klib"])
|
||||
librariesWithIgnoredClassCollisions.addAll(["kotlin-util-klib", "kotlin-util-io", "kotlinx-metadata-klib", "kotlin-native-utils"])
|
||||
if (project.hasProperty('kotlinProjectPath')) {
|
||||
resolvingRulesWithRegexes[new Regex("META-INF/.+\\.kotlin_module")] = "kotlin-compiler"
|
||||
resolvingRules["META-INF/extensions/compiler.xml"] = "kotlin-compiler"
|
||||
|
||||
Reference in New Issue
Block a user