grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gradle: Improve compatibility with Gradle 8

This commit is contained in:
Eric Anderson 2023-05-08 10:46:10 -07:00 committed by GitHub
parent f458f229c6
commit 8dbc88f3a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
all/build.gradle
View File

@ -52,19 +52,12 @@ tasks.named("javadoc").configure {
} }
} }
tasks.register("jacocoMerge", JacocoMerge) { tasks.named("jacocoTestReport").configure {
dependsOn(subprojects.jacocoTestReport.dependsOn) dependsOn(subprojects.jacocoTestReport.dependsOn)
dependsOn(project(':grpc-interop-testing').jacocoTestReport.dependsOn) dependsOn(project(':grpc-interop-testing').jacocoTestReport.dependsOn)
mustRunAfter(subprojects.jacocoTestReport.mustRunAfter) executionData.from files(subprojects.jacocoTestReport.executionData)
mustRunAfter(project(':grpc-interop-testing').jacocoTestReport.mustRunAfter)
destinationFile = file("${buildDir}/jacoco/test.exec")
executionData = files(subprojects.jacocoTestReport.executionData)
.plus(project(':grpc-interop-testing').jacocoTestReport.executionData) .plus(project(':grpc-interop-testing').jacocoTestReport.executionData)
.filter { f -> f.exists() } .filter { f -> f.exists() }
}
tasks.named("jacocoTestReport").configure {
dependsOn(jacocoMerge)
reports { reports {
xml.required = true xml.required = true
html.required = true html.required = true

4
authz/build.gradle
View File

@ -32,11 +32,11 @@ dependencies {
} }
tasks.named("jar").configure { tasks.named("jar").configure {
classifier = 'original' archiveClassifier = 'original'
} }
tasks.named("shadowJar").configure { tasks.named("shadowJar").configure {
classifier = null archiveClassifier = null
dependencies { dependencies {
exclude(dependency {true}) exclude(dependency {true})
} }

2
build.gradle
View File

@ -453,7 +453,7 @@ subprojects {
tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) { tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
dependsOn jar dependsOn jar
oldClasspath = files(baselineArtifact) oldClasspath = files(baselineArtifact)
newClasspath = files(jar.archivePath) newClasspath = files(jar.archiveFile)
onlyBinaryIncompatibleModified = false onlyBinaryIncompatibleModified = false
// Be quiet about things that did not change // Be quiet about things that did not change
onlyModified = true onlyModified = true