JPS build flag: exclude java9 when jps build enabled

This commit is contained in:
Sergey Rostov
2019-01-16 16:01:21 +03:00
parent 1031edc933
commit 12cfd6396d
7 changed files with 33 additions and 11 deletions
+11 -3
View File
@@ -11,8 +11,12 @@ pill {
importAsLibrary = true
}
def jpsBuild = findProperty("jpsBuild")?.toString() == "true"
sourceSets {
java9
if (!jpsBuild) {
java9
}
}
dependencies {
@@ -36,7 +40,9 @@ task modularJar(type: Jar) {
classifier = 'modular'
from zipTree(jar.outputs.files.singleFile)
from sourceSets.java9.output
if (!jpsBuild) {
from sourceSets.java9.output
}
}
artifacts {
@@ -59,4 +65,6 @@ compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
}
compileJava9Sources(project, 'kotlin.test')
if (!jpsBuild) {
compileJava9Sources(project, 'kotlin.test')
}