Merge pull request #247 from jbgi/upgrade-retrolambda

jbgi · jbgi · commit 270455722b28 · 2016-05-16T09:50:08.000+02:00
Update to latest retrolambda release and gradle plugin.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,8 @@ ext {
 buildscript {
     ext {
 		uptodateVersion = "1.6.0"
-        retrolambdaVersion = "3.2.0"
+        retrolambdaPluginVersion = "3.2.5"
+        retrolambdaVersion = "2.3.0"
     }
 
     repositories {
@@ -18,12 +19,11 @@ buildscript {
 
     dependencies {
         classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"
-        classpath "me.tatarka:gradle-retrolambda:$retrolambdaVersion"
+        classpath "me.tatarka:gradle-retrolambda:$retrolambdaPluginVersion"
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
     }
 }
 
-
 apply plugin: "jacoco"
 apply plugin: 'com.github.kt3k.coveralls'
 
diff --git a/lib.gradle b/lib.gradle
@@ -90,6 +90,9 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol
             oldJdk System.getenv(oldJdkEnvVar)
             javaVersion retroLambdaTarget
         }
+        dependencies {
+            retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ ext {`
`7`	`7`	`buildscript {`
`8`	`8`	`ext {`
`9`	`9`	`uptodateVersion = "1.6.0"`
`10`		`- retrolambdaVersion = "3.2.0"`
	`10`	`+ retrolambdaPluginVersion = "3.2.5"`
	`11`	`+ retrolambdaVersion = "2.3.0"`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`repositories {`
`@@ -18,12 +19,11 @@ buildscript {`
`18`	`19`
`19`	`20`	`dependencies {`
`20`	`21`	`classpath "com.ofg:uptodate-gradle-plugin:$uptodateVersion"`
`21`		`- classpath "me.tatarka:gradle-retrolambda:$retrolambdaVersion"`
	`22`	`+ classpath "me.tatarka:gradle-retrolambda:$retrolambdaPluginVersion"`
`22`	`23`	`classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`
`26`		`-`
`27`	`27`	`apply plugin: "jacoco"`
`28`	`28`	`apply plugin: 'com.github.kt3k.coveralls'`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ void configureRetroLambda(boolean useRetroLambda, String newJdkEnvVar, String ol`
`90`	`90`	`oldJdk System.getenv(oldJdkEnvVar)`
`91`	`91`	`javaVersion retroLambdaTarget`
`92`	`92`	`}`
	`93`	`+ dependencies {`
	`94`	`+ retrolambdaConfig "net.orfjackal.retrolambda:retrolambda:$retrolambdaVersion"`
	`95`	`+ }`
`93`	`96`	`}`
`94`	`97`	`}`
`95`	`98`