diff --git a/backend.native/build.gradle b/backend.native/build.gradle index 3e0fe753a0a..36f1616dd53 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -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") { diff --git a/build.gradle b/build.gradle index 7b55a0a16c0..c9dce2e0144 100644 --- a/build.gradle +++ b/build.gradle @@ -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"