diff --git a/gradle.properties b/gradle.properties index 3dec257c309..55d05f66de6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,3 +10,4 @@ kotlin.compiler.newInferenceEnabled=true #signingRequired=true #useBootstrapStdlib=true +#jpsBuild=true diff --git a/gradle.properties.as32 b/gradle.properties.as32 index 6df4c3922d6..410e1b13e3d 100644 --- a/gradle.properties.as32 +++ b/gradle.properties.as32 @@ -13,3 +13,4 @@ intellijUltimateEnabled=false intellijEnforceCommunitySdk=true #useBootstrapStdlib=true +#jpsBuild=true diff --git a/gradle.properties.as33 b/gradle.properties.as33 index 6df4c3922d6..b6fd27e60e0 100644 --- a/gradle.properties.as33 +++ b/gradle.properties.as33 @@ -13,3 +13,4 @@ intellijUltimateEnabled=false intellijEnforceCommunitySdk=true #useBootstrapStdlib=true +#jpsBuild=true \ No newline at end of file diff --git a/gradle.properties.as34 b/gradle.properties.as34 index 6df4c3922d6..b6fd27e60e0 100644 --- a/gradle.properties.as34 +++ b/gradle.properties.as34 @@ -13,3 +13,4 @@ intellijUltimateEnabled=false intellijEnforceCommunitySdk=true #useBootstrapStdlib=true +#jpsBuild=true \ No newline at end of file diff --git a/gradle.properties.cidr183 b/gradle.properties.cidr183 index bbee36fdecd..86ce473c700 100644 --- a/gradle.properties.cidr183 +++ b/gradle.properties.cidr183 @@ -12,3 +12,4 @@ kotlin.compiler.newInferenceEnabled=true cidrPluginsEnabled=true #useBootstrapStdlib=true +#jpsBuild=true \ No newline at end of file diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index ee0a071ae4e..047bf95738c 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/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') +} diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle index 4c3dba787f5..5549f9bf6bb 100644 --- a/libraries/reflect/api/build.gradle +++ b/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( - project, 'kotlin.reflect', - [sourceSets.main.output, configurations.compileOnly.filter { - !it.name.contains("kotlin-stdlib") - }] -) +if (!jpsBuild) { + compileJava9Sources( + project, 'kotlin.reflect', + [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 {