Include new coroutines and unsigned classes into stdlib

Fix clashing module name in common coroutines sourceset
This commit is contained in:
Ilya Gorbunov
2018-06-21 03:13:03 +03:00
parent 4c6c0aa279
commit b160561795
4 changed files with 859 additions and 22 deletions
+7 -3
View File
@@ -86,6 +86,8 @@ jar {
manifestAttributes(manifest, project, 'Main', true)
from("${rootDir}/dist/builtins")
from sourceSets.experimental.output
from sourceSets.coroutines.output
from sourceSets.unsigned.output
// TODO: enable as soon as this doesn't cause D8/DX to crash
// from sourceSets.java9.output
}
@@ -98,6 +100,8 @@ task distJar(type: Jar) {
from sourceSets.annotations.output
from sourceSets.main.output
from sourceSets.experimental.output
from sourceSets.coroutines.output
from sourceSets.unsigned.output
// TODO: enable as soon as this doesn't cause D8/DX to crash
// from sourceSets.java9.output
}
@@ -107,7 +111,6 @@ task coroutinesJar(type: Jar) {
classifier = 'coroutines'
manifestAttributes(manifest, project, 'Main', true)
project.configure(manifest) { attributes 'Kotlin-Version': '1.3' }
from sourceSets.coroutines.output
}
task unsignedJar(type: Jar) {
@@ -115,11 +118,11 @@ task unsignedJar(type: Jar) {
classifier = 'unsigned'
manifestAttributes(manifest, project, 'Main', true)
project.configure(manifest) { attributes 'Kotlin-Version': '1.3' }
from sourceSets.unsigned.output
}
sourcesJar {
from "${rootDir}/core/builtins/native"
from sourceSets.coroutines.kotlin
}
task distSourcesJar(type: Jar) {
@@ -183,7 +186,8 @@ compileKotlin {
"-Xnormalize-constructor-calls=enable",
"-module-name", "kotlin-stdlib",
"-Xuse-experimental=kotlin.Experimental",
"-XXLanguage:-ReleaseCoroutines"
"-XXLanguage:-ReleaseCoroutines",
"-XXLanguage:+InlineClasses"
]
}
}