Skip to content

Commit 6b95170

Browse files
mperrymperry
committed
Initial JDK 17 support
1 parent 6718bc0 commit 6b95170

7 files changed

Lines changed: 68 additions & 65 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 2 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"

‎core/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

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

68
archivesBaseName = project.projectName
@@ -13,6 +15,4 @@ dependencies {
1315
}
1416

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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎java-core/build.gradle‎

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

44
ext {
55
signModule = true
6+
uploadModule = true
67
}
78

89
dependencies {
@@ -12,7 +13,5 @@ dependencies {
1213
}
1314

1415
performSigning(signingEnabled, signModule)
15-
configureUpload(signingEnabled, signModule)
16+
configureUpload(signingEnabled, signModule, uploadModule)
1617

17-
18-
uploadArchives.enabled = true

‎lib.gradle‎

Lines changed: 56 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -67,80 +67,84 @@ def customisePom(pom, gradleProject) {
6767
}
6868

6969

70-
void configureUpload(String signingEnabled, Boolean signModule) {
71-
publishing {
70+
void configureUpload(String signingEnabled, Boolean signModule, Boolean uploadModule) {
7271

73-
publications {
72+
if (uploadModule) {
7473

75-
mavenJava(MavenPublication) {
76-
groupId project.group
77-
artifactId project.name
78-
version project.version
74+
publishing {
7975

80-
from components.java
76+
publications {
8177

82-
customisePom(pom, rootProject)
78+
mavenJava(MavenPublication) {
79+
groupId project.group
80+
artifactId project.name
81+
version project.version
8382

84-
artifact sourcesJar
85-
artifact javadocJar
83+
from components.java
8684

87-
if (doSigning(signingEnabled, signModule)) {
88-
// sign the pom
89-
pom.withXml {
90-
def pomFile = file("${project.buildDir}/generated-pom.xml.asc")
91-
writeTo(pomFile)
92-
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
93-
artifact(pomAscFile) {
94-
classifier = null
95-
extension = 'pom.asc'
96-
}
97-
pomFile.delete()
98-
}
85+
customisePom(pom, rootProject)
86+
87+
artifact sourcesJar
88+
artifact javadocJar
9989

100-
// sign the artifacts
101-
project.tasks.signArchives.signatureFiles.each {
102-
artifact(it) {
103-
def matcher = it.file =~ /-(sources|javadoc|jre8|jre9)\.jar\.asc$/
104-
if (matcher.find()) {
105-
classifier = matcher.group(1)
106-
} else {
90+
if (doSigning(signingEnabled, signModule)) {
91+
// sign the pom
92+
pom.withXml {
93+
def pomFile = file("${project.buildDir}/generated-pom.xml.asc")
94+
writeTo(pomFile)
95+
def pomAscFile = signing.sign(pomFile).signatureFiles[0]
96+
artifact(pomAscFile) {
10797
classifier = null
98+
extension = 'pom.asc'
99+
}
100+
pomFile.delete()
101+
}
102+
103+
// sign the artifacts
104+
project.tasks.signArchives.signatureFiles.each {
105+
artifact(it) {
106+
def matcher = it.file =~ /-(sources|javadoc|jre8|jre9)\.jar\.asc$/
107+
if (matcher.find()) {
108+
classifier = matcher.group(1)
109+
} else {
110+
classifier = null
111+
}
112+
extension = 'jar.asc'
108113
}
109-
extension = 'jar.asc'
110114
}
111115
}
116+
112117
}
113118

114119
}
115120

116-
}
117-
118-
repositories {
119-
maven {
120-
url project.sonatypeUploadUrl
121-
credentials {
122-
username sonatypeUsername
123-
password sonatypePassword
121+
repositories {
122+
maven {
123+
url project.sonatypeUploadUrl
124+
credentials {
125+
username sonatypeUsername
126+
password sonatypePassword
127+
}
124128
}
125129
}
126-
}
127130

128-
}
129-
130-
131-
model {
132-
tasks.publishMavenJavaPublicationToMavenLocal {
133-
dependsOn(project.tasks.signArchives)
134-
}
135-
tasks.publishMavenJavaPublicationToMavenRepository {
136-
dependsOn(project.tasks.signArchives)
137-
}
138-
tasks.publish {
139-
dependsOn(project.tasks.build)
140131
}
132+
133+
model {
134+
tasks.publishMavenJavaPublicationToMavenLocal {
135+
dependsOn(project.tasks.signArchives)
136+
}
137+
tasks.publishMavenJavaPublicationToMavenRepository {
138+
dependsOn(project.tasks.signArchives)
139+
}
140+
tasks.publish {
141+
dependsOn(project.tasks.build)
142+
}
141143
// tasks.install {
142144
// dependsOn(project.tasks.build)
143145
// }
146+
}
147+
144148
}
145149

146150
}

‎props-core-scalacheck/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ tasks.withType(ScalaCompile) {
2424
}
2525

2626
performSigning(signingEnabled, signModule)
27-
configureUpload(signingEnabled, signModule)
27+
configureUpload(signingEnabled, signModule, project.uploadModule)

‎quickcheck/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
ext {
33
signModule = true
4+
uploadModule = true
45
}
56

67
archivesBaseName = "${project.projectName}-${project.name}"
@@ -11,6 +12,4 @@ dependencies {
1112
}
1213

1314
performSigning(signingEnabled, signModule)
14-
configureUpload(signingEnabled, signModule)
15-
16-
uploadArchives.enabled = true
15+
configureUpload(signingEnabled, signModule, uploadModule)

0 commit comments

Comments
 (0)