Backport to Java 6

mperry · mperry · commit 67f1fc9f2c35 · 2015-12-07T09:12:09.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -36,11 +36,11 @@ allprojects {
 
 	ext {
         isSnapshot = false
-        fjBaseVersion = "4.4"
+        fjBaseVersion = "4.4.1"
 
         snapshotAppendix = "-SNAPSHOT"
 		fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
-        fjConsumeVersion = "4.3"
+        fjConsumeVersion = "4.4"
 
         signModule = false
         useRetroLambda = true
@@ -62,7 +62,9 @@ allprojects {
         primaryEmail = "functionaljava@googlegroups.com"
 
         dependencyJunit = "junit:junit:4.12"
-
+        backportVersion = JavaVersion.VERSION_1_6
+        backportJdk = System.getenv("JAVA8_HOME")
+        backportOldJdk = System.getenv("JAVA6_HOME")
     }
 
 	version = fjVersion
diff --git a/core/build.gradle b/core/build.gradle
@@ -21,8 +21,8 @@ uploadArchives.enabled = true
 
 if (useRetroLambda) {
     retrolambda {
-        jdk System.getenv("JAVA8_HOME")
-        oldJdk System.getenv("JAVA7_HOME")
-        javaVersion JavaVersion.VERSION_1_7
+        jdk backportJdk
+        oldJdk backportOldJdk
+        javaVersion backportVersion
     }
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -9,9 +9,9 @@ mainClassName = "fj.demo.euler.Problem2"
 
 if (useRetroLambda) {
     retrolambda {
-        jdk System.getenv("JAVA8_HOME")
-        oldJdk System.getenv("JAVA7_HOME")
-        javaVersion JavaVersion.VERSION_1_7
+        jdk backportJdk
+        oldJdk backportOldJdk
+        javaVersion backportVersion
     }
 }
 
diff --git a/props-core/build.gradle b/props-core/build.gradle
@@ -3,9 +3,9 @@ if (useRetroLambda) {
     apply plugin: 'me.tatarka.retrolambda'
 
     retrolambda {
-        jdk System.getenv("JAVA8_HOME")
-        oldJdk System.getenv("JAVA7_HOME")
-        javaVersion JavaVersion.VERSION_1_7
+        jdk backportJdk
+        oldJdk backportOldJdk
+        javaVersion backportVersion
     }
 }
 
diff --git a/quickcheck/build.gradle b/quickcheck/build.gradle
@@ -7,9 +7,9 @@ if (useRetroLambda) {
     apply plugin: 'me.tatarka.retrolambda'
 
     retrolambda {
-        jdk System.getenv("JAVA8_HOME")
-        oldJdk System.getenv("JAVA7_HOME")
-        javaVersion JavaVersion.VERSION_1_7
+        jdk backportJdk
+        oldJdk backportOldJdk
+        javaVersion backportVersion
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ uploadArchives.enabled = true`
`21`	`21`
`22`	`22`	`if (useRetroLambda) {`
`23`	`23`	`retrolambda {`
`24`		`- jdk System.getenv("JAVA8_HOME")`
`25`		`- oldJdk System.getenv("JAVA7_HOME")`
`26`		`- javaVersion JavaVersion.VERSION_1_7`
	`24`	`+ jdk backportJdk`
	`25`	`+ oldJdk backportOldJdk`
	`26`	`+ javaVersion backportVersion`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ mainClassName = "fj.demo.euler.Problem2"`
`9`	`9`
`10`	`10`	`if (useRetroLambda) {`
`11`	`11`	`retrolambda {`
`12`		`- jdk System.getenv("JAVA8_HOME")`
`13`		`- oldJdk System.getenv("JAVA7_HOME")`
`14`		`- javaVersion JavaVersion.VERSION_1_7`
	`12`	`+ jdk backportJdk`
	`13`	`+ oldJdk backportOldJdk`
	`14`	`+ javaVersion backportVersion`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ if (useRetroLambda) {`
`3`	`3`	`apply plugin: 'me.tatarka.retrolambda'`
`4`	`4`
`5`	`5`	`retrolambda {`
`6`		`- jdk System.getenv("JAVA8_HOME")`
`7`		`- oldJdk System.getenv("JAVA7_HOME")`
`8`		`- javaVersion JavaVersion.VERSION_1_7`
	`6`	`+ jdk backportJdk`
	`7`	`+ oldJdk backportOldJdk`
	`8`	`+ javaVersion backportVersion`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ if (useRetroLambda) {`
`7`	`7`	`apply plugin: 'me.tatarka.retrolambda'`
`8`	`8`
`9`	`9`	`retrolambda {`
`10`		`- jdk System.getenv("JAVA8_HOME")`
`11`		`- oldJdk System.getenv("JAVA7_HOME")`
`12`		`- javaVersion JavaVersion.VERSION_1_7`
	`10`	`+ jdk backportJdk`
	`11`	`+ oldJdk backportOldJdk`
	`12`	`+ javaVersion backportVersion`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`