Merged branch v4.4.x

mperry · mperry · commit 606f723f8f3b · 2015-12-10T22:42:15.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ addons:
       - oracle-java8-installer
 
 script:
+  - jdk_switcher use openjdk6 && export JAVA6_HOME=$JAVA_HOME
   - jdk_switcher use oraclejdk7 && export JAVA7_HOME=$JAVA_HOME
   - jdk_switcher use oraclejdk8 && export JAVA8_HOME=$JAVA_HOME
   - ./gradlew build coverage -s -i
diff --git a/build.gradle b/build.gradle
@@ -78,8 +78,8 @@ allprojects {
         displayCompilerWarnings = true
 
         newJdkEnvVar = "JAVA8_HOME"
-        oldJdkEnvVar = "JAVA7_HOME"
-        retroLambdaTarget = JavaVersion.VERSION_1_7
+        oldJdkEnvVar = "JAVA6_HOME"
+        retroLambdaTarget = JavaVersion.VERSION_1_6
     }
 
     repositories {

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ allprojects {`
`78`	`78`	`displayCompilerWarnings = true`
`79`	`79`
`80`	`80`	`newJdkEnvVar = "JAVA8_HOME"`
`81`		`- oldJdkEnvVar = "JAVA7_HOME"`
`82`		`- retroLambdaTarget = JavaVersion.VERSION_1_7`
	`81`	`+ oldJdkEnvVar = "JAVA6_HOME"`
	`82`	`+ retroLambdaTarget = JavaVersion.VERSION_1_6`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`repositories {`