Use java 7 and run scala tests using retro lambda

mperry · mperry · commit fb3ba4f14ea1 · 2014-04-06T20:40:44.000+10:00
diff --git a/core/src/main/java/fj/Equal.java b/core/src/main/java/fj/Equal.java
@@ -80,7 +80,7 @@ public Boolean f(final A a1) {
    * @return A new equal.
    */
   public <B> Equal<B> comap(final F<B, A> f) {
-    return equal(F1Functions.o(F1Functions.o(F1Functions.andThen(f), this.f), f));
+    return equal(F1Functions.o(F1Functions.o(F1Functions.<B, A, Boolean>andThen(f), this.f), f));
   }
 
   /**
diff --git a/core/src/main/java/fj/Ord.java b/core/src/main/java/fj/Ord.java
@@ -78,7 +78,7 @@ public Boolean f(final A a1, final A a2) {
    * @return A new ord.
    */
   public <B> Ord<B> comap(final F<B, A> f) {
-    return ord(F1Functions.o(F1Functions.o(F1Functions.andThen(f), this.f), f));
+    return ord(F1Functions.o(F1Functions.o(F1Functions.<B, A, Ordering>andThen(f), this.f), f));
   }
 
   /**
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -1,6 +1,18 @@
 
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'me.tatarka:gradle-retrolambda:1.3.1'
+    }
+}
+
 apply plugin: 'java'
 apply plugin: 'application'
+apply plugin: 'retrolambda'
 
 defaultTasks 'build'
 
@@ -15,6 +27,13 @@ repositories {
     mavenCentral()
 }
 
+
+retrolambda {
+    jdk System.getenv("JAVA8_HOME")
+    oldJdk System.getenv("JAVA7_HOME")
+    javaVersion JavaVersion.VERSION_1_7
+}
+
 dependencies {
 	compile 'org.slf4j:slf4j-api:1.7.5'
 	compile project(":core")
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
 
-//include 'core', 'demo', 'tests'
-include 'core', 'demo'
+include 'core', 'demo', 'tests'
+//include 'core', 'demo'
diff --git a/tests/src/test/scala/fj/data/CheckIteratee.scala b/tests/src/test/scala/fj/data/CheckIteratee.scala
@@ -7,6 +7,7 @@ import Unit.unit
 import List.{list, nil}
 import Option.{some, none}
 import fj.Function._
+import fj.F1Functions
 import fj.data.Iteratee._
 
 import org.scalacheck.Prop._
@@ -50,7 +51,7 @@ object CheckIteratee extends Properties("Iteratee") {
       var tail = l
       while(!isDone(i) && !tail.isEmpty) {
         val input = Input.el(tail.head)
-        val cont: F[F[Input[E], IterV[E, A]], P1[IterV[E, A]]] = Function.apply(input).`lazy`()
+        val cont: F[F[Input[E], IterV[E, A]], P1[IterV[E, A]]] = F1Functions.`lazy`(Function.apply(input))
         i = i.fold(done, cont)._1
         tail = tail.tail
       }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public Boolean f(final A a1) {`
`80`	`80`	`* @return A new equal.`
`81`	`81`	`*/`
`82`	`82`	`public <B> Equal<B> comap(final F<B, A> f) {`
`83`		`- return equal(F1Functions.o(F1Functions.o(F1Functions.andThen(f), this.f), f));`
	`83`	`+ return equal(F1Functions.o(F1Functions.o(F1Functions.<B, A, Boolean>andThen(f), this.f), f));`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public Boolean f(final A a1, final A a2) {`
`78`	`78`	`* @return A new ord.`
`79`	`79`	`*/`
`80`	`80`	`public <B> Ord<B> comap(final F<B, A> f) {`
`81`		`- return ord(F1Functions.o(F1Functions.o(F1Functions.andThen(f), this.f), f));`
	`81`	`+ return ord(F1Functions.o(F1Functions.o(F1Functions.<B, A, Ordering>andThen(f), this.f), f));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`