Skip to content

Commit 7df943c

Browse files
mperrymperry
committed
Upgraded some libraries identified by gradlew dependencyUpdates
1 parent ea4b028 commit 7df943c

43 files changed

Lines changed: 82 additions & 44 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ matrix:
1111
fast_finish: true
1212

1313
include:
14-
- jdk: openjdk12
14+
- jdk: openjdk11
1515
script:
1616
- ./gradlew build coverage -s -i
1717
after_success:
1818
- bash <(curl -s https://codecov.io/bash)
19-
- '[ "$TRAVIS_BRANCH" = "series/5.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
19+
- '[ "$TRAVIS_BRANCH" = "series/6.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
2020
&& ./gradlew uploadArchives'
2121

2222
allow_failures:

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0"
15-
classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0"
14+
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
15+
classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0"
1616
}
1717

1818
wrapper {
@@ -46,7 +46,7 @@ allprojects {
4646

4747
snapshotAppendix = "-SNAPSHOT"
4848
fjVersion = fjBaseVersion + (isSnapshot ? snapshotAppendix : "")
49-
fjConsumeVersion = "5.0"
49+
fjConsumeVersion = "4.9"
5050

5151
signModule = false
5252

@@ -66,8 +66,8 @@ allprojects {
6666
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
6767
primaryEmail = "functionaljava@googlegroups.com"
6868

69-
junitCompile = "junit:junit:4.12"
70-
junitRuntime = "org.junit.vintage:junit-vintage-engine:5.5.2"
69+
junitCompile = "junit:junit:4.13.2"
70+
junitRuntime = "org.junit.vintage:junit-vintage-engine:5.8.2"
7171

7272
displayCompilerWarnings = true
7373
generateTestReports = false

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ archivesBaseName = project.projectName
88
dependencies {
99
testCompile junitCompile
1010
testRuntime junitRuntime
11-
testCompile 'com.h2database:h2:1.4.199'
11+
testCompile 'com.h2database:h2:2.1.210'
1212
testCompile 'commons-dbutils:commons-dbutils:1.7'
1313
}
1414

‎core/src/test/java/fj/ClassTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
import java.lang.reflect.Type;
1010
import java.util.Collection;
11-
import java.util.Iterator;
1211

12+
import static org.hamcrest.MatcherAssert.assertThat;
1313
import static org.hamcrest.core.Is.is;
14-
import static org.junit.Assert.assertThat;
1514

1615
public class ClassTest {
1716
@Test

‎core/src/test/java/fj/DigitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import static fj.data.Array.range;
77
import static org.hamcrest.core.Is.is;
8-
import static org.junit.Assert.assertThat;
8+
import static org.hamcrest.MatcherAssert.assertThat;
99

1010
public class DigitTest {
1111
@Test

‎core/src/test/java/fj/FFunctionsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.Test;
66
import static org.hamcrest.core.Is.is;
77
import static org.junit.Assert.*;
8+
import static org.hamcrest.MatcherAssert.assertThat;
89

910
public class FFunctionsTest {
1011

‎core/src/test/java/fj/MonoidTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import static fj.data.Option.some;
1010
import static org.hamcrest.core.Is.is;
11-
import static org.junit.Assert.assertThat;
11+
import static org.hamcrest.MatcherAssert.assertThat;
12+
1213

1314
public class MonoidTest {
1415

‎core/src/test/java/fj/OrderingTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import static fj.Ordering.LT;
1010
import static org.hamcrest.core.Is.is;
1111
import static org.junit.Assert.*;
12+
import static org.hamcrest.MatcherAssert.assertThat;
13+
1214

1315
public class OrderingTest {
1416

‎core/src/test/java/fj/PTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import static fj.Function.identity;
66
import static org.hamcrest.core.Is.is;
7-
import static org.junit.Assert.assertThat;
7+
import static org.hamcrest.MatcherAssert.assertThat;
8+
89

910
public class PTest {
1011
@Test

‎core/src/test/java/fj/TryEffectTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import fj.function.TryEffect0;
55
import fj.function.TryEffect1;
66
import org.junit.Test;
7+
8+
import static org.hamcrest.MatcherAssert.assertThat;
79
import static org.hamcrest.core.Is.is;
8-
import static org.junit.Assert.*;
910

1011
public class TryEffectTest {
1112

0 commit comments

Comments
 (0)