Skip to content

Commit 5ecd37c

Browse files
mperrymperry
committed
Upgrade Gradle to 7.3, jacoco to 0.8.7. Upgrade plugin from java to java-library, maven to maven-publish
1 parent df6e6f8 commit 5ecd37c

27 files changed

Lines changed: 173 additions & 80 deletions

‎build.gradle‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildscript {
1616
}
1717

1818
wrapper {
19-
gradleVersion = "6.8.3"
19+
gradleVersion = "7.3"
2020
distributionType = Wrapper.DistributionType.ALL
2121
}
2222
}
@@ -35,7 +35,7 @@ allprojects {
3535
apply plugin: "jacoco"
3636

3737
jacoco {
38-
toolVersion = "0.8.2"
38+
toolVersion = "0.8.7"
3939
}
4040

4141
defaultTasks "build"
@@ -49,6 +49,7 @@ allprojects {
4949
fjConsumeVersion = "5.0"
5050

5151
signModule = false
52+
uploadModule = false
5253

5354
projectTitle = "Functional Java"
5455
projectName = "functionaljava"
@@ -58,12 +59,20 @@ allprojects {
5859
projectUrl = "http://functionaljava.org/"
5960
scmUrl = "git://github.com/functionaljava/functionaljava.git"
6061
scmGitFile = "scm:git@github.com:functionaljava/functionaljava.git"
62+
scmSshGitFile = "scm:git:ssh://git@github.com/functionaljava/functionaljava.git"
63+
licenseUrl = "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
64+
licenseName = "The BSD3 License"
65+
66+
issueUrl = "https://github.com/functionaljava/functionaljava/issues"
67+
githubUrl = "https://github.com/functionaljava/functionaljava"
6168

6269
sonatypeBaseUrl = "https://oss.sonatype.org"
6370
sonatypeSnapshotUrl = "$sonatypeBaseUrl/content/repositories/snapshots/"
6471
sonatypeRepositoryUrl = "$sonatypeBaseUrl/content/groups/public"
6572
sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/"
73+
6674
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
75+
6776
primaryEmail = "functionaljava@googlegroups.com"
6877

6978
junitCompile = "junit:junit:4.13.2"
@@ -94,7 +103,7 @@ subprojects {
94103
}
95104

96105
apply from: "$rootDir/lib.gradle"
97-
apply plugin: "java"
106+
apply plugin: "java-library"
98107
apply plugin: "eclipse"
99108

100109
repositories {
@@ -139,7 +148,7 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
139148

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

142-
apply plugin: "maven"
151+
apply plugin: "maven-publish"
143152
apply plugin: "signing"
144153
apply plugin: "biz.aQute.bnd.builder"
145154
sourceCompatibility = "1.8"
@@ -164,7 +173,7 @@ configure(subprojects.findAll { it.name != "props-core" }) {
164173
}
165174

166175
jar {
167-
version project.fjVersion
176+
archiveVersion = project.fjVersion
168177
bnd (
169178
'Bundle-Name': 'Functional Java',
170179
'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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22
ext {
33
signModule = true
4+
uploadModule = true
5+
46
}
57

68
archivesBaseName = project.projectName
79

810
dependencies {
9-
testCompile junitCompile
10-
testRuntime junitRuntime
11-
testCompile 'com.h2database:h2:2.1.210'
12-
testCompile 'commons-dbutils:commons-dbutils:1.7'
11+
testImplementation junitCompile
12+
testRuntimeOnly junitRuntime
13+
testImplementation 'com.h2database:h2:2.1.210'
14+
testImplementation 'commons-dbutils:commons-dbutils:1.7'
1315
}
1416

1517
performSigning(signingEnabled, signModule)
16-
configureUpload(signingEnabled, signModule)
17-
18-
uploadArchives.enabled = true
18+
configureUpload(signingEnabled, signModule, uploadModule)

‎core/src/test/java/fj/control/parallel/StrategyTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static org.hamcrest.core.Is.is;
1919
import static org.hamcrest.MatcherAssert.assertThat;
2020

21-
2221
public class StrategyTest {
2322

2423
@Test

‎core/src/test/java/fj/data/ArrayTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import static org.hamcrest.CoreMatchers.instanceOf;
88
import static org.hamcrest.MatcherAssert.assertThat;
99

10+
1011
public class ArrayTest {
1112

1213
@Test

‎core/src/test/java/fj/data/BooleansTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static org.hamcrest.core.Is.is;
1212
import static org.hamcrest.MatcherAssert.assertThat;
1313

14+
1415
public class BooleansTest {
1516

1617
@Test

‎core/src/test/java/fj/data/DListTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static org.hamcrest.core.Is.is;
77
import static org.hamcrest.MatcherAssert.assertThat;
88

9+
910
public class DListTest {
1011
@Test
1112
public void testConsSnoc() {

‎core/src/test/java/fj/data/LazyStringTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static org.hamcrest.CoreMatchers.is;
77
import static org.hamcrest.MatcherAssert.assertThat;
88

9+
910
public class LazyStringTest {
1011

1112
@Test

‎core/src/test/java/fj/data/ListBufferTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static org.hamcrest.CoreMatchers.equalTo;
66
import static org.hamcrest.MatcherAssert.assertThat;
77

8+
89
public class ListBufferTest {
910

1011
@Test

‎core/src/test/java/fj/data/List_Traverse_Tests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.hamcrest.CoreMatchers.is;
1010
import static org.hamcrest.MatcherAssert.assertThat;
1111

12+
1213
public class List_Traverse_Tests {
1314

1415
@Test

0 commit comments

Comments
 (0)