Move release coroutines sources into the corresponding stdlib sourcesets
This commit is contained in:
@@ -19,8 +19,6 @@ sourceSets {
|
|||||||
srcDir 'src'
|
srcDir 'src'
|
||||||
srcDir commonSrcDir
|
srcDir commonSrcDir
|
||||||
srcDir '../unsigned/src'
|
srcDir '../unsigned/src'
|
||||||
srcDir '../coroutines/common/src'
|
|
||||||
srcDir '../coroutines/src'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
|
|||||||
@@ -15,9 +15,6 @@ def builtinsSrcDir = "${buildDir}/builtin-sources"
|
|||||||
def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
|
def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
|
||||||
def commonSrcDir = "${projectDir}/../src/kotlin"
|
def commonSrcDir = "${projectDir}/../src/kotlin"
|
||||||
def commonSrcDir2 = "${projectDir}/../common/src"
|
def commonSrcDir2 = "${projectDir}/../common/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 coroutinesExpJsSrcDir = "${rootDir}/libraries/stdlib/coroutines-experimental/js/src"
|
||||||
|
|
||||||
def builtinsDir = "${rootDir}/core/builtins"
|
def builtinsDir = "${rootDir}/core/builtins"
|
||||||
@@ -50,7 +47,6 @@ sourceSets {
|
|||||||
kotlin {
|
kotlin {
|
||||||
srcDir builtinsSrcDir
|
srcDir builtinsSrcDir
|
||||||
srcDir jsSrcDir
|
srcDir jsSrcDir
|
||||||
srcDir coroutinesJsSrcDir
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,7 +147,7 @@ compileKotlin2Js {
|
|||||||
sourceMap = true
|
sourceMap = true
|
||||||
sourceMapPrefix = "./"
|
sourceMapPrefix = "./"
|
||||||
freeCompilerArgs += [
|
freeCompilerArgs += [
|
||||||
"-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir, unsignedCommonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator),
|
"-source-map-base-dirs", [builtinsSrcDir, jsSrcDir, commonSrcDir, commonSrcDir2, unsignedCommonSrcDir].collect { file(it).absoluteFile }.join(File.pathSeparator),
|
||||||
"-Xuse-experimental=kotlin.Experimental",
|
"-Xuse-experimental=kotlin.Experimental",
|
||||||
"-Xuse-experimental=kotlin.ExperimentalMultiplatform",
|
"-Xuse-experimental=kotlin.ExperimentalMultiplatform",
|
||||||
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
|
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
|
||||||
@@ -253,7 +249,7 @@ task compileJs(type: JavaExec) {
|
|||||||
if (prefixToRemove != null) sourcePath.substring(prefixToRemove.length()) else sourcePath
|
if (prefixToRemove != null) sourcePath.substring(prefixToRemove.length()) else sourcePath
|
||||||
}
|
}
|
||||||
|
|
||||||
def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir, unsignedCommonSrcDir, coroutinesJsSrcDir, coroutinesCommonSrcDir, coroutinesCommonHSrcDir]
|
def sourceMapSourcesBaseDirs = [jsSrcDir, jsSrcJsDir, builtinsSrcDir, commonSrcDir, commonSrcDir2, projectDir, experimentalSrcDir, unsignedCommonSrcDir]
|
||||||
|
|
||||||
sourceMap.sourcesContent = sourceMap.sources.collect { sourceName ->
|
sourceMap.sourcesContent = sourceMap.sources.collect { sourceName ->
|
||||||
def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text
|
def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ sourceSets {
|
|||||||
srcDir "${rootDir}/core/builtins/src"
|
srcDir "${rootDir}/core/builtins/src"
|
||||||
srcDir 'runtime'
|
srcDir 'runtime'
|
||||||
srcDir 'src'
|
srcDir 'src'
|
||||||
srcDir '../coroutines/jvm/src'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
experimental {
|
experimental {
|
||||||
|
|||||||
Reference in New Issue
Block a user