Skip to content

Commit d93378b

Browse files
committed
Update gradle wrapper to support JDK 17
1 parent 7aa7b78 commit d93378b

7 files changed

Lines changed: 173 additions & 132 deletions

File tree

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ test {
1414
}
1515
}
1616

17-
build.dependsOn jacocoTestReport
17+
test.dependsOn("jar")
1818

1919
jacocoTestReport {
2020
reports {
21-
csv.enabled = false
22-
xml.enabled = true
21+
csv.required = false
22+
xml.required = true
2323
xml.destination = file("$buildDir/reports/jacoco/jacoco.xml")
24-
html.enabled = true
24+
html.required = true
2525
html.destination = file("$buildDir/reports/jacoco/html")
2626
}
2727
doLast {
@@ -32,6 +32,8 @@ jacocoTestReport {
3232
}
3333
}
3434

35+
test.finalizedBy("jacocoTestReport")
36+
3537
jacocoTestCoverageVerification {
3638
violationRules {
3739
rule {
@@ -61,4 +63,4 @@ jacocoTestCoverageVerification {
6163
}
6264
}
6365

64-
check.dependsOn jacocoTestCoverageVerification
66+
jacocoTestReport.finalizedBy("jacocoTestCoverageVerification")

build.shared

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repositories {
66

77
dependencies {
88
testImplementation (
9-
"junit:junit:4.12",
9+
"junit:junit:4.13.2",
1010
)
1111

1212
implementation (
@@ -29,7 +29,7 @@ compileTestJava {
2929
test {
3030
getReports().getJunitXml().setDestination(file("$buildDir/reports/tests/xml"))
3131
getReports().getHtml().setDestination(file("$buildDir/reports/tests/html"))
32-
setBinResultsDir(file("$buildDir/reports/tests/bin"))
32+
setBinaryResultsDirectory(file("$buildDir/reports/tests/bin"))
3333
}
3434

3535
jar {
@@ -57,13 +57,13 @@ task sourcesJar(type: Jar) {
5757
classifier = 'sources'
5858
}
5959

60-
build.dependsOn("copyLibs");
61-
6260
task copyLibs(type: Copy) {
6361
into "$buildDir/dependencies/"
6462
from configurations.runtimeClasspath
6563
}
6664

65+
build.finalizedBy("copyLibs")
66+
6767
artifacts {
6868
//archives jar // already specified by default
6969
archives javadocJar

config/checkstyle/checkstyle.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<module name="JavadocMethod">
1919
<property name="scope" value="public"/>
2020
<property name="excludeScope" value="private"/>
21-
<property name="suppressLoadErrors" value="true"/>
2221
</module>
2322
<module name="JavadocStyle"/>
2423
<module name="JavadocType"/>

gradle/wrapper/gradle-wrapper.jar

841 Bytes
Binary file not shown.
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.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)