Move coroutines to kotlin.coroutines package: stdlib

Copy everything from kotlin.coroutines.experimental to
kotlin.coroutines. The latter is separate source set to be packed into
separate kotlin-stdlib-coroutines.jar
 #KT-23362
This commit is contained in:
Ilmir Usmanov
2018-04-19 17:08:42 +03:00
parent ebdee1f24c
commit 30ab1e2b35
14 changed files with 988 additions and 0 deletions
+37
View File
@@ -34,6 +34,14 @@ sourceSets {
srcDir "../experimental"
}
}
coroutines {
kotlin {
srcDir '../coroutines/jvm/src'
srcDir '../coroutines/common/src'
srcDir '../coroutines/src'
}
compileClasspath += sourceSets.main.output
}
test {
kotlin {
srcDir 'test'
@@ -80,6 +88,14 @@ task distJar(type: Jar) {
// from sourceSets.java9.output
}
task coroutinesJar(type: Jar) {
baseName = 'kotlin-stdlib-coroutines'
version = null
manifestAttributes(manifest, project, 'Main', true)
project.configure(manifest) { attributes 'Kotlin-Version': '1.3' }
from("${rootDir}/dist/builtins")
from sourceSets.coroutines.output
}
sourcesJar {
from "${rootDir}/core/builtins/native"
@@ -121,6 +137,13 @@ dist {
}
}
task coroutinesDist(type: Copy) {
from coroutinesJar
into distDir
}
dist.dependsOn coroutinesDist
task dexMethodCount(type: DexMethodCount) {
from jar
ownPackages = ['kotlin']
@@ -159,4 +182,18 @@ compileExperimentalKotlin {
compileJava9Sources(project, 'kotlin.stdlib')
compileCoroutinesKotlin {
kotlinOptions {
languageVersion = "1.3"
apiVersion = "1.3"
freeCompilerArgs = [
"-version",
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to=${buildDir}/stdlib-coroutines-declarations.json",
"-module-name", "kotlin-stdlib-coroutines"
]
}
}
kotlin.experimental.coroutines 'enable'