Build: support local.properties for JPS build. Apply JPS related tweaks only inside IDEA import.
This commit is contained in:
@@ -11,10 +11,10 @@ pill {
|
||||
importAsLibrary = true
|
||||
}
|
||||
|
||||
def jpsBuild = findProperty("jpsBuild")?.toString() == "true"
|
||||
def includeJava9 = BuildPropertiesKt.getKotlinBuildProperties(project).includeJava9
|
||||
|
||||
sourceSets {
|
||||
if (!jpsBuild) {
|
||||
if (includeJava9) {
|
||||
java9
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@ task modularJar(type: Jar) {
|
||||
classifier = 'modular'
|
||||
|
||||
from zipTree(jar.outputs.files.singleFile)
|
||||
if (!jpsBuild) {
|
||||
if (includeJava9) {
|
||||
from sourceSets.java9.output
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,6 @@ compileTestKotlin {
|
||||
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
|
||||
}
|
||||
|
||||
if (!jpsBuild) {
|
||||
if (includeJava9) {
|
||||
compileJava9Sources(project, 'kotlin.test')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user