Skip to content

Commit 1988fa3

Browse files
committed
Merged java-7-8-compatible to master
2 parents c8e7095 + 300a1a6 commit 1988fa3

40 files changed

+1351
-1280
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77
allprojects {
88
ext {
99
isSnapshot = true
10-
fjBaseVersion = "4.0"
10+
fjBaseVersion = "4.1"
1111

1212
snapshotAppendix = "-SNAPSHOT"
1313
fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")

consume/src/main/java/fj/consume/euler/Problem1.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class Problem1 {
1515

1616
public static void main(final String[] args) {
1717
java7();
18-
java8();
1918
}
2019

2120
public static void java7() {
@@ -24,8 +23,4 @@ public static void java7() {
2423
})));
2524
}
2625

27-
public static void java8() {
28-
out.println(Stream.range(0, 1000).filter(i -> i % 3 == 0 || i % 5 == 0).foldLeft((acc, i) -> acc + i, 0));
29-
}
30-
3126
}

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)