diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle index 202c4f50c5e..86a54f1419d 100644 --- a/libraries/stdlib/js/build.gradle +++ b/libraries/stdlib/js/build.gradle @@ -15,10 +15,13 @@ def builtinsSrcDir = "${buildDir}/builtin-sources" def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins" def commonSrcDir = "${projectDir}/../src/kotlin" def commonSrcDir2 = "${projectDir}/../common/src" -def coroutinesJsSrcDir = "${projectDir}/../coroutines/js/src" -def coroutinesExpJsSrcDir = "${projectDir}/../coroutines-experimental/js/src" +def coroutinesCommonHSrcDir = "${rootDir}/libraries/stdlib/coroutines/common/src" +def coroutinesCommonSrcDir = "${rootDir}/libraries/stdlib/coroutines/src" +def coroutinesJsSrcDir = "${rootDir}/libraries/stdlib/coroutines/js/src" +def coroutinesExpJsSrcDir = "${rootDir}/libraries/stdlib/coroutines-experimental/js/src" def builtinsDir = "${rootDir}/core/builtins" +def unsignedCommonSrcDir = "${rootDir}/libraries/stdlib/unsigned/src" def experimentalSrcDir = "${rootDir}/libraries/stdlib/experimental" def experimentalJsModuleName = 'kotlin-experimental' def coroutinesJsModuleName = 'kotlin-stdlib-coroutines' @@ -150,7 +153,7 @@ compileKotlin2Js { sourceMap = true sourceMapPrefix = "./" freeCompilerArgs += [ - "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2].collect { file(it).absoluteFile }.join(File.pathSeparator), + "-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir, unsignedCommonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator), "-Xuse-experimental=kotlin.Experimental", "-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xuse-experimental=kotlin.contracts.ExperimentalContracts", @@ -252,7 +255,7 @@ task compileJs(type: JavaExec) { if (prefixToRemove != null) sourcePath.substring(prefixToRemove.length()) else sourcePath } - def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir] + def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir, unsignedCommonSrcDir, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir] sourceMap.sourcesContent = sourceMap.sources.collect { sourceName -> def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text