Skip to content

Commit 300a1a6

Browse files
committed
Merged mperry/functionaljava branch java8-backward-compatible to branch java-7-8-compatible
2 parents 95251c6 + 6c2fda1 commit 300a1a6

39 files changed

+1352
-1277
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ext {
66

77
allprojects {
88
ext {
9-
fjVersion = "4.0-SNAPSHOT"
9+
fjVersion = "4.1-SNAPSHOT"
1010
projectName = "functionaljava"
1111
}
1212
version = fjVersion

core/src/main/java/fj/Equal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public Boolean f(final A a1) {
8080
* @return A new equal.
8181
*/
8282
public <B> Equal<B> comap(final F<B, A> f) {
83-
return equal(f.<Boolean>andThen().o(this.f).o(f));
83+
return equal(F1Functions.o(F1Functions.o(F1Functions.<B, A, Boolean>andThen(f), this.f), f));
8484
}
8585

8686
/**

0 commit comments

Comments
 (0)