Skip to content

Commit 66fa557

Browse files
committed
upgrade gradle to 8.10.2
1 parent 867a5f6 commit 66fa557

File tree

3 files changed

+11
-43
lines changed

3 files changed

+11
-43
lines changed

build.gradle

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id 'com.github.kt3k.coveralls' version '2.12.2'
33
id 'jacoco'
44
id 'me.champeau.gradle.jmh' version '0.5.3'
5-
id 'nebula.optional-base' version '3.1.0'
65
id 'com.github.hierynomus.license' version '0.16.1'
76
id 'com.github.spotbugs' version "6.0.14"
87
id 'maven-publish'
@@ -46,7 +45,6 @@ configure(publishedProjects) {
4645
apply plugin: 'maven-publish'
4746
apply plugin: 'signing'
4847
apply plugin: 'me.champeau.gradle.jmh'
49-
apply plugin: 'nebula.optional-base'
5048
apply plugin: 'com.github.hierynomus.license'
5149

5250
sourceCompatibility = 1.8
@@ -88,6 +86,10 @@ configure(publishedProjects) {
8886
jmh.java.srcDirs += sourceSets.test.java.srcDirs
8987
}
9088

89+
tasks.named('compileJmhJava') {
90+
dependsOn processTestResources, compileTestJava
91+
}
92+
9193
dependencies {
9294
jmh 'org.openjdk.jmh:jmh-core:1.12'
9395
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
@@ -183,42 +185,8 @@ nexusPublishing {
183185
}
184186
}
185187

186-
task jacocoMerge(type: JacocoMerge) {
187-
publishedProjects.each { subproject ->
188-
executionData subproject.tasks.withType(Test)
189-
}
190-
doFirst {
191-
executionData = files(executionData.findAll { it.exists() })
192-
}
193-
}
194-
195-
task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
196-
description = 'Generates an aggregate report from all subprojects'
197-
dependsOn publishedProjects.test, jacocoMerge
198-
199-
getAdditionalSourceDirs().setFrom(files(publishedProjects.sourceSets.main.allSource.srcDirs))
200-
getSourceDirectories().setFrom(files(publishedProjects.sourceSets.main.allSource.srcDirs))
201-
getAdditionalClassDirs().setFrom(files(publishedProjects.sourceSets.main.output))
202-
executionData jacocoMerge.destinationFile
203-
204-
reports {
205-
html.enabled = true // human readable
206-
xml.enabled = true // required by coveralls
207-
}
208-
}
209-
210-
coveralls {
211-
sourceDirs = publishedProjects.sourceSets.main.allSource.srcDirs.flatten()
212-
jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
213-
}
214-
215-
tasks.coveralls {
216-
group = 'Coverage reports'
217-
description = 'Uploads the aggregated coverage report to Coveralls'
218-
219-
dependsOn jacocoRootReport
220-
onlyIf { System.env.'CI' && !JavaVersion.current().isJava9Compatible() }
221-
}
188+
// Note: Aggregate JaCoCo reporting has been removed due to type resolution issues with Gradle 8.x
189+
// Individual subprojects still generate their own coverage reports via the jacoco plugin
222190

223191
// standard POM format required by MavenCentral
224192
def customizePom(pom, title) {

core-api/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ dependencies {
77
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
88

99
// an assortment of json parsers
10-
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
11-
compileOnly group: 'org.json', name: 'json', version: jsonVersion, optional
12-
compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion, optional
13-
compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
10+
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
11+
compileOnly group: 'org.json', name: 'json', version: jsonVersion
12+
compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
13+
compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
1414
}
1515

1616
tasks.named('processJmhResources') {
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-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)