[#610] Build: use minimal target java version for the current JDK

remkop · Jan 17, 2019 · c959a39 · c959a39
1 parent 01f1bfb
commit c959a39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,10 @@ jdk:
 #
 #  - openjdk6 # gradle 3.1 requires java 7
 
+matrix:
+  allow_failures:
+  - jdk: oraclejdk-ea
+
 before_script:
   - chmod +x gradlew
 # for CodeClimate

diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,10 @@ allprojects {
     apply plugin: 'groovy'
     apply plugin: 'java'
     apply plugin: 'java-library' // to avoid https://github.com/gradle/gradle/issues/1118
-    sourceCompatibility = 1.5
-    targetCompatibility = 1.5
+    sourceCompatibility = !org.gradle.api.JavaVersion.current().isJava9Compatible() ?
+            1.5 : org.gradle.api.JavaVersion.current().isJava11Compatible() ? 1.7 : 1.6
+    targetCompatibility = !org.gradle.api.JavaVersion.current().isJava9Compatible() ?
+            1.5 : org.gradle.api.JavaVersion.current().isJava11Compatible() ? 1.7 : 1.6
 
     repositories {
         jcenter()