Use sourceCompatibility = 1.6 when building with Java 9

valdisrigdon · Jun 3, 2016 · c25877e · c25877e
1 parent 8f59e12
commit c25877e
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/subprojects/base-services-groovy/base-services-groovy.gradle b/subprojects/base-services-groovy/base-services-groovy.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile libraries.groovy

diff --git a/subprojects/base-services/base-services.gradle b/subprojects/base-services/base-services.gradle
@@ -5,7 +5,7 @@
  * application (eg as part of the tooling API).
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     publishCompile libraries.slf4j_api

diff --git a/subprojects/cli/cli.gradle b/subprojects/cli/cli.gradle
@@ -21,7 +21,7 @@
     It has no dependencies, and should never have any.
 */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     testCompile libraries.groovy

diff --git a/subprojects/core/core.gradle b/subprojects/core/core.gradle
@@ -16,7 +16,7 @@
 
 apply from: "$rootDir/gradle/taskProperties.gradle"
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 configurations {
     reports

diff --git a/subprojects/jvm-services/jvm-services.gradle b/subprojects/jvm-services/jvm-services.gradle
@@ -2,7 +2,7 @@
  * JVM invocation and inspection abstractions.
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(":processServices")

diff --git a/subprojects/launcher/launcher.gradle b/subprojects/launcher/launcher.gradle
@@ -1,7 +1,7 @@
 import org.gradle.internal.jvm.Jvm
 
 // Main entry point requires Java 5
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 configurations {
     startScriptGenerator

diff --git a/subprojects/logging/logging.gradle b/subprojects/logging/logging.gradle
@@ -2,7 +2,7 @@
  * Logging infrastructure.
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile libraries.groovy

diff --git a/subprojects/messaging/messaging.gradle b/subprojects/messaging/messaging.gradle
@@ -1,4 +1,4 @@
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     publishCompile project(':baseServices')

diff --git a/subprojects/model-core/model-core.gradle b/subprojects/model-core/model-core.gradle
@@ -19,7 +19,7 @@
  */
 apply plugin: 'groovy'
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile libraries.slf4j_api

diff --git a/subprojects/model-groovy/model-groovy.gradle b/subprojects/model-groovy/model-groovy.gradle
@@ -20,7 +20,7 @@
  */
 apply plugin: "groovy"
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile libraries.slf4j_api

diff --git a/subprojects/native/native.gradle b/subprojects/native/native.gradle
@@ -2,7 +2,7 @@
     This project contains various native operating system integration utilities.
 */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(':baseServices')

diff --git a/subprojects/open-api/open-api.gradle b/subprojects/open-api/open-api.gradle
@@ -1,4 +1,4 @@
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     integTestCompile libraries.groovy

diff --git a/subprojects/process-services/process-services.gradle b/subprojects/process-services/process-services.gradle
@@ -2,7 +2,7 @@
  * Process execution abstractions.
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(':baseServices')

diff --git a/subprojects/resources/resources.gradle b/subprojects/resources/resources.gradle
@@ -3,7 +3,7 @@
  */
 apply plugin: "groovy"
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile libraries.slf4j_api

diff --git a/subprojects/tooling-api/tooling-api.gradle b/subprojects/tooling-api/tooling-api.gradle
@@ -1,7 +1,7 @@
 import org.gradle.build.*
 
 // GradleConnector entry point requires Java 5
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(':core')

diff --git a/subprojects/ui/ui.gradle b/subprojects/ui/ui.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(':core')

diff --git a/subprojects/wrapper/wrapper.gradle b/subprojects/wrapper/wrapper.gradle
@@ -15,7 +15,7 @@
  */
 
 // Wrapper main entry point requirest Java 5
-sourceCompatibility = 1.5
+sourceCompatibility = javaVersion.java9Compatible ? 1.6 : 1.5
 
 dependencies {
     compile project(":cli")