Rename coroutines sourceset to coroutinesExperimental

Restore experimental coroutine tests as they were before e22ca022
and compile and run them twice:
 - first time with LV=1.2
 - second time with LV=1.3
This commit is contained in:
Ilya Gorbunov
2018-11-17 00:12:16 +03:00
parent 673844a059
commit ec3692026d
6 changed files with 576 additions and 39 deletions
+11 -11
View File
@@ -67,7 +67,7 @@ sourceSets {
}
}
coroutines {
coroutinesExperimental {
kotlin {
srcDir coroutinesExpJsSrcDir
}
@@ -83,7 +83,7 @@ dependencies {
commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
testCompile project(':kotlin-test:kotlin-test-js')
merger project(":tools:kotlin-stdlib-js-merger")
coroutinesCompile project.files { sourceSets.main.output.files }.builtBy(compileKotlin2Js)
coroutinesExperimentalCompile project.files { sourceSets.main.output.files }.builtBy(compileKotlin2Js)
}
task prepareComparableSource(type: Copy) {
@@ -172,11 +172,11 @@ compileExperimentalKotlin2Js {
}
}
compileCoroutinesKotlin2Js {
compileCoroutinesExperimentalKotlin2Js {
kotlinOptions {
languageVersion = "1.3"
apiVersion = "1.3"
outputFile = "${buildDir}/classes/coroutines/kotlin.js"
outputFile = "${buildDir}/classes/coroutinesExperimental/kotlin.js"
sourceMap = true
sourceMapPrefix = "./"
freeCompilerArgs += [
@@ -198,11 +198,11 @@ compileTestKotlin2Js {
}
task compileJs(type: JavaExec) {
dependsOn compileBuiltinsKotlin2Js, compileKotlin2Js, compileExperimentalKotlin2Js, compileCoroutinesKotlin2Js
dependsOn compileBuiltinsKotlin2Js, compileKotlin2Js, compileExperimentalKotlin2Js, compileCoroutinesExperimentalKotlin2Js
inputs.files(compileBuiltinsKotlin2Js.outputs.files)
inputs.files(compileKotlin2Js.outputs.files)
inputs.files(compileExperimentalKotlin2Js.outputs.files)
inputs.files(compileCoroutinesKotlin2Js.outputs.files)
inputs.files(compileCoroutinesExperimentalKotlin2Js.outputs.files)
inputs.dir(jsSrcDir)
outputs.file(jsOutputFile)
outputs.file("${jsOutputFile}.map")
@@ -216,7 +216,7 @@ task compileJs(type: JavaExec) {
args = [jsOutputFile, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
(compileBuiltinsKotlin2Js.outputs.files.collect { it.path }.sort() +
compileKotlin2Js.outputs.files.collect { it.path }.sort() +
compileCoroutinesKotlin2Js.outputs.files.collect { it.path }.sort() /* +
compileCoroutinesExperimentalKotlin2Js.outputs.files.collect { it.path }.sort() /* +
compileExperimentalKotlin2Js.outputs.files.collect { it.path }.sort() */).findAll {
it.endsWith(".js") && !it.endsWith(".meta.js")
}
@@ -264,7 +264,7 @@ task compileJs(type: JavaExec) {
sourceMapFile.text = groovy.json.JsonOutput.toJson(sourceMap)
file(jsOutputMetaFile).text = file(compileKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js')).text +
file(compileCoroutinesKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js')).text /* +
file(compileCoroutinesExperimentalKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js')).text /* +
file(compileExperimentalKotlin2Js.outputFile.path.replaceAll('\\.js$', '.meta.js')).text
.replaceFirst(experimentalJsModuleName, 'kotlin') */
}
@@ -295,7 +295,7 @@ task mergedJar(type: Jar, dependsOn: compileJs) {
from "${jsOutputFile}.map"
from sourceSets.main.output
from sourceSets.experimental.output
from("${buildDir}/classes/coroutines/kotlin") {
from("${buildDir}/classes/coroutinesExperimental/kotlin") {
into coroutinesJsModuleName
}
exclude "${experimentalJsModuleName}.*"
@@ -319,7 +319,7 @@ task sourcesJar(type: Jar, dependsOn: compileJs) {
from(sourceSets.experimental.allSource) {
into 'kotlin'
}
from(sourceSets.coroutines.allSource) {
from(sourceSets.coroutinesExperimental.allSource) {
into 'kotlin'
}
}
@@ -338,7 +338,7 @@ task distSourcesJar(type: Jar) {
into 'common'
}
from(project(":kotlin-stdlib-common").sourceSets.coroutines.allSource) {
from(project(":kotlin-stdlib-common").sourceSets.coroutinesExperimental.allSource) {
into 'kotlin'
}
}