Skip to content

Commit 6718bc0

Browse files
mperrymperry
committed
Merged from series/6.x
2 parents 338999b + 02a35cd commit 6718bc0

Some content is hidden

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

51 files changed

+219
-105
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ matrix:
1515
- ./gradlew build coverage -s -i
1616
after_success:
1717
- bash <(curl -s https://codecov.io/bash)
18-
- '[ "$TRAVIS_BRANCH" = "series/5.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
18+
- '[ "$TRAVIS_BRANCH" = "series/6.x" -a "$TRAVIS_PULL_REQUEST" = "false" -a -z "$TRAVIS_TAG" ]
1919
&& ./gradlew uploadArchives'
2020

2121
allow_failures:

‎build.gradle

Lines changed: 15 additions & 7 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 {
@@ -58,16 +58,24 @@ allprojects {
5858
projectUrl = "http://functionaljava.org/"
5959
scmUrl = "git://github.com/functionaljava/functionaljava.git"
6060
scmGitFile = "scm:git@github.com:functionaljava/functionaljava.git"
61+
scmSshGitFile = "scm:git:ssh://git@github.com/functionaljava/functionaljava.git"
62+
licenseUrl = "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
63+
licenseName = "The BSD3 License"
64+
65+
issueUrl = "https://github.com/functionaljava/functionaljava/issues"
66+
githubUrl = "https://github.com/functionaljava/functionaljava"
6167

6268
sonatypeBaseUrl = "https://oss.sonatype.org"
6369
sonatypeSnapshotUrl = "$sonatypeBaseUrl/content/repositories/snapshots/"
6470
sonatypeRepositoryUrl = "$sonatypeBaseUrl/content/groups/public"
6571
sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/"
72+
6673
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
74+
6775
primaryEmail = "functionaljava@googlegroups.com"
6876

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

7280
displayCompilerWarnings = true
7381
generateTestReports = false
@@ -94,7 +102,7 @@ subprojects {
94102
}
95103

96104
apply from: "$rootDir/lib.gradle"
97-
apply plugin: "java"
105+
apply plugin: "java-library"
98106
apply plugin: "eclipse"
99107

100108
repositories {
@@ -139,7 +147,7 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
139147

140148
configure(subprojects.findAll { it.name != "props-core" }) {
141149

142-
apply plugin: "maven"
150+
apply plugin: "maven-publish"
143151
apply plugin: "signing"
144152
apply plugin: "biz.aQute.bnd.builder"
145153
sourceCompatibility = "1.8"
@@ -164,7 +172,7 @@ configure(subprojects.findAll { it.name != "props-core" }) {
164172
}
165173

166174
jar {
167-
version project.fjVersion
175+
archiveVersion = project.fjVersion
168176
bnd (
169177
'Bundle-Name': 'Functional Java',
170178
'Signature-Version': project.fjVersion,

‎consume/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
archivesBaseName = "${project.projectName}-${project.name}"
33

44
dependencies {
5-
compile("$group:$projectName:$fjConsumeVersion")
5+
api "$group:$projectName:$fjConsumeVersion"
66

7-
testCompile junitCompile
8-
testRuntime junitRuntime
7+
testImplementation junitCompile
8+
testRuntimeOnly junitRuntime
99
}

‎core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ext {
66
archivesBaseName = project.projectName
77

88
dependencies {
9-
testCompile junitCompile
10-
testRuntime junitRuntime
11-
testCompile 'com.h2database:h2:1.4.199'
12-
testCompile 'commons-dbutils:commons-dbutils:1.7'
9+
testImplementation junitCompile
10+
testRuntimeOnly junitRuntime
11+
testImplementation 'com.h2database:h2:2.1.210'
12+
testImplementation 'commons-dbutils:commons-dbutils:1.7'
1313
}
1414

1515
performSigning(signingEnabled, signModule)

‎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

0 commit comments

Comments
 (0)