Update to latest retrolambda plugin. Only backport to Java7

jbgi · jbgi · commit ce4e24595c16 · 2016-10-23T12:49:34.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,6 @@ before_script:
   - sudo service x11-common stop || true
 
 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
@@ -6,8 +6,8 @@ ext {
 
 buildscript {
     ext {
-		uptodateVersion = "1.6.0"
-        retrolambdaPluginVersion = "3.2.5"
+		uptodateVersion = "1.6.2"
+        retrolambdaPluginVersion = "3.3.1"
         retrolambdaVersion = "2.3.0"
     }
 
@@ -79,8 +79,8 @@ allprojects {
         displayCompilerWarnings = true
 
         newJdkEnvVar = "JAVA8_HOME"
-        oldJdkEnvVar = "JAVA6_HOME"
-        retroLambdaTarget = JavaVersion.VERSION_1_6
+        oldJdkEnvVar = "JAVA7_HOME"
+        retroLambdaTarget = JavaVersion.VERSION_1_7
     }
 
     repositories {
diff --git a/lib.gradle b/lib.gradle
@@ -93,6 +93,10 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol
         dependencies {
             retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
         }
+    } else {
+        jar {
+            classifier = 'java8'
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol`
`93`	`93`	`dependencies {`
`94`	`94`	`retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"`
`95`	`95`	`}`
	`96`	`+ } else {`
	`97`	`+ jar {`
	`98`	`+ classifier = 'java8'`
	`99`	`+ }`
`96`	`100`	`}`
`97`	`101`	`}`
`98`	`102`