diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts index b7f51428f72..b02787eca05 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts @@ -57,9 +57,6 @@ val jsMainSources by task { val fullJsMainSources = tasks.getByPath(":kotlin-stdlib-js-ir:jsMainSources") exclude( listOf( - "libraries/stdlib/js-ir/runtime/collectionsHacks.kt", - "libraries/stdlib/js-ir/src/generated/**", - "libraries/stdlib/js-ir/src/kotlin/text/**", "libraries/stdlib/js/src/jquery/**", "libraries/stdlib/js/src/org.w3c/**", "libraries/stdlib/js/src/kotlin/char.kt", @@ -87,6 +84,19 @@ val jsMainSources by task { fullJsMainSources.outputs.files.singleFile } + for (jsIrSrcDir in listOf("builtins", "runtime", "src")) { + from("$rootDir/libraries/stdlib/js-ir/$jsIrSrcDir") { + exclude( + listOf( + "collectionsHacks.kt", + "generated/**", + "kotlin/text/**" + ) + ) + into("libraries/stdlib/js-ir/$jsIrSrcDir") + } + } + from("$rootDir/libraries/stdlib/js-ir-minimal-for-test/src") into("$buildDir/jsMainSources") } diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index ad5bf6097fe..c7ef3936c7e 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -46,9 +46,6 @@ val jsMainSources by task { "core/builtins/src/kotlin/", "libraries/stdlib/js/src/", "libraries/stdlib/js/runtime/", - "libraries/stdlib/js-ir/builtins/", - "libraries/stdlib/js-ir/src/", - "libraries/stdlib/js-ir/runtime/", // TODO get rid - move to test module "js/js.translator/testData/_commonFiles/" @@ -109,6 +106,9 @@ kotlin { } val jsMain by getting { kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) + kotlin.srcDir("builtins") + kotlin.srcDir("runtime") + kotlin.srcDir("src") } val commonTest by getting { dependencies {