Move release coroutines sources into the corresponding stdlib sourcesets

This commit is contained in:
Ilya Gorbunov
2018-11-17 06:34:05 +03:00
parent 7d61a2de73
commit 5c94ef229b
25 changed files with 2 additions and 9 deletions
-2
View File
@@ -19,8 +19,6 @@ sourceSets {
srcDir 'src'
srcDir commonSrcDir
srcDir '../unsigned/src'
srcDir '../coroutines/common/src'
srcDir '../coroutines/src'
}
}
test {
+2 -6
View File
@@ -15,9 +15,6 @@ def builtinsSrcDir = "${buildDir}/builtin-sources"
def builtinsSrcDir2 = "${buildDir}/builtin-sources-for-builtins"
def commonSrcDir = "${projectDir}/../src/kotlin"
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 builtinsDir = "${rootDir}/core/builtins"
@@ -50,7 +47,6 @@ sourceSets {
kotlin {
srcDir builtinsSrcDir
srcDir jsSrcDir
srcDir coroutinesJsSrcDir
}
}
@@ -151,7 +147,7 @@ compileKotlin2Js {
sourceMap = true
sourceMapPrefix = "./"
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.ExperimentalMultiplatform",
"-Xuse-experimental=kotlin.contracts.ExperimentalContracts",
@@ -253,7 +249,7 @@ task compileJs(type: JavaExec) {
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 ->
def text = sourceMapSourcesBaseDirs.collect { file("$it/$sourceName") }.find { it.exists() }?.text
-1
View File
@@ -19,7 +19,6 @@ sourceSets {
srcDir "${rootDir}/core/builtins/src"
srcDir 'runtime'
srcDir 'src'
srcDir '../coroutines/jvm/src'
}
}
experimental {