From 87bf6e010eeb93e6e22110d6a6e7ab407245a2e0 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 20 Jan 2022 01:21:31 +0300 Subject: [PATCH] Use relative paths in stdlib klib artifacts Intentionally use doFirst section to trick gradle and not affect inputs with absolute path usage. Old behaviour can be returned by kotlin.build.use.absolute.paths.in.klib in local.properties Should be removed after KT-50876 fix. ^KTI-730 In Progress --- libraries/kotlin.test/js-ir/build.gradle.kts | 6 ++++++ libraries/stdlib/js-ir/build.gradle.kts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index f583b1baa92..0ffd46288be 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -52,6 +52,12 @@ tasks.withType>().configureEach { "-opt-in=kotlin.ExperimentalMultiplatform", "-opt-in=kotlin.contracts.ExperimentalContracts" ) + + doFirst { + kotlinOptions.freeCompilerArgs += listOfNotNull( + "-Xklib-relative-path-base=$buildDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } + ) + } } tasks.named("compileKotlinJs") { diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index f7df4ee0e36..f8412b3517b 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -143,6 +143,12 @@ tasks.withType>().configureEach { "-opt-in=kotlin.ExperimentalUnsignedTypes", "-opt-in=kotlin.ExperimentalStdlibApi" ) + + doFirst { + kotlinOptions.freeCompilerArgs += listOfNotNull( + "-Xklib-relative-path-base=$buildDir".takeIf { !kotlinBuildProperties.getBoolean("kotlin.build.use.absolute.paths.in.klib") } + ) + } } val compileKotlinJs by tasks.existing(KotlinCompile::class) {