JPS build flag: exclude java9 when jps build enabled

gradle.properties

@@ -10,3 +10,4 @@ kotlin.compiler.newInferenceEnabled=true
 #signingRequired=true
 
 #useBootstrapStdlib=true
+#jpsBuild=true

gradle.properties.as32

@@ -13,3 +13,4 @@ intellijUltimateEnabled=false
 intellijEnforceCommunitySdk=true
 
 #useBootstrapStdlib=true
+#jpsBuild=true

gradle.properties.as33

@@ -13,3 +13,4 @@ intellijUltimateEnabled=false
 intellijEnforceCommunitySdk=true
 
 #useBootstrapStdlib=true
+#jpsBuild=true

gradle.properties.as34

@@ -13,3 +13,4 @@ intellijUltimateEnabled=false
 intellijEnforceCommunitySdk=true
 
 #useBootstrapStdlib=true
+#jpsBuild=true

gradle.properties.cidr183

@@ -12,3 +12,4 @@ kotlin.compiler.newInferenceEnabled=true
 cidrPluginsEnabled=true
 
 #useBootstrapStdlib=true
+#jpsBuild=true

libraries/kotlin.test/jvm/build.gradle

@@ -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')
+}

libraries/reflect/api/build.gradle

@@ -4,13 +4,18 @@ apply plugin: 'kotlin'
 
 configureJvm6Project(project)
 
+def jpsBuild = findProperty("jpsBuild")?.toString() == "true"
+
 sourceSets {
     main {
         java {
             srcDir "${rootDir}/core/reflection.jvm/src"
         }
     }
-    java9
+
+    if (!jpsBuild) {
+        java9
+    }
 }
 
 dependencies {
@@ -23,12 +28,14 @@ dependencies {
     compileOnly "org.jetbrains:annotations:13.0"
 }
 
-compileJava9Sources(
+if (!jpsBuild) {
-        project, 'kotlin.reflect',
+    compileJava9Sources(
-        [sourceSets.main.output, configurations.compileOnly.filter {
+            project, 'kotlin.reflect',
-            !it.name.contains("kotlin-stdlib")
+            [sourceSets.main.output, configurations.compileOnly.filter {
-        }]
+                !it.name.contains("kotlin-stdlib")
-)
+            }]
+    )
+}
 
 compileKotlin {
     kotlinOptions {
@@ -45,7 +52,9 @@ jar {
 
 task java9Jar(type: Jar) {
     classifier = "java9"
-    from sourceSets.java9.output
+    if (!jpsBuild) {
+        from sourceSets.java9.output
+    }
 }
 
 artifacts {