gradle: Improve compatibility with Gradle 8

ejona86 · web-flow · commit 8dbc88f3a35f · 2023-05-08T10:46:10.000-07:00
diff --git a/all/build.gradle b/all/build.gradle
@@ -52,19 +52,12 @@ tasks.named("javadoc").configure {
     }
 }
 
-tasks.register("jacocoMerge", JacocoMerge) {
+tasks.named("jacocoTestReport").configure {
     dependsOn(subprojects.jacocoTestReport.dependsOn)
     dependsOn(project(':grpc-interop-testing').jacocoTestReport.dependsOn)
-    mustRunAfter(subprojects.jacocoTestReport.mustRunAfter)
-    mustRunAfter(project(':grpc-interop-testing').jacocoTestReport.mustRunAfter)
-    destinationFile = file("${buildDir}/jacoco/test.exec")
-    executionData = files(subprojects.jacocoTestReport.executionData)
+    executionData.from files(subprojects.jacocoTestReport.executionData)
             .plus(project(':grpc-interop-testing').jacocoTestReport.executionData)
             .filter { f -> f.exists() }
-}
-
-tasks.named("jacocoTestReport").configure {
-    dependsOn(jacocoMerge)
     reports {
         xml.required = true
         html.required = true
diff --git a/authz/build.gradle b/authz/build.gradle
@@ -32,11 +32,11 @@ dependencies {
 }
 
 tasks.named("jar").configure {
-    classifier = 'original'
+    archiveClassifier = 'original'
 }
 
 tasks.named("shadowJar").configure {
-    classifier = null
+    archiveClassifier = null
     dependencies {
         exclude(dependency {true})
     }
diff --git a/build.gradle b/build.gradle
@@ -453,7 +453,7 @@ subprojects {
         tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
             dependsOn jar
             oldClasspath = files(baselineArtifact)
-            newClasspath = files(jar.archivePath)
+            newClasspath = files(jar.archiveFile)
             onlyBinaryIncompatibleModified = false
             // Be quiet about things that did not change
             onlyModified = true

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ dependencies {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`tasks.named("jar").configure {`
`35`		`- classifier = 'original'`
	`35`	`+ archiveClassifier = 'original'`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`tasks.named("shadowJar").configure {`
`39`		`- classifier = null`
	`39`	`+ archiveClassifier = null`
`40`	`40`	`dependencies {`
`41`	`41`	`exclude(dependency {true})`
`42`	`42`	`}`