Upgrade to gradle 8.13

Author: lesserwhirls

build.gradle

@@ -84,13 +84,13 @@ gradle.projectsEvaluated {
 
 tasks.named('wrapper') {
   distributionType = Wrapper.DistributionType.ALL
-  gradleVersion = '6.9.1'
+  gradleVersion = '8.13'
 }
 
 // Set up properties needed for all testing, adds "testAll" task to root
 apply from: "$rootDir/gradle/root/testing.gradle"
 // Generates coverage report for testAll
-apply from: "$rootDir/gradle/root/coverage.gradle"
+//apply from: "$rootDir/gradle/root/coverage.gradle"
 // Attaches fatJar tasks to root project (makes toolsUI, ncIdv, etc.)
 apply from: "$rootDir/gradle/root/fatJars.gradle"
 // Creates pubs for artifacts created in fatJars.gradle

docs/build.gradle

@@ -189,7 +189,7 @@ tasks.withType(JavaCompile).configureEach {
   options.compilerArgs = ['-Xlint:deprecation']
 }
 
-apply plugin: 'com.diffplug.gradle.spotless'
+apply plugin: 'com.diffplug.spotless'
 spotless {
   java {
     // target java files in the test directory

gradle/any/coverage.gradle

@@ -44,12 +44,6 @@ tasks.withType(JacocoReport).all {  // Will apply to ":<subproject>:jacocoTestRe
   group = 'Reports'
   dependsOn tasks.withType(Test)
 
-  reports {
-    xml.enabled = false
-    html.enabled = true
-    csv.enabled = false
-  }
-
   // By default, JacocoReport runs onlyIf ALL of the executionData exist. We want it to run if ANY exists.
   setOnlyIf {
     executionData.any {

gradle/any/dependencies.gradle

@@ -56,6 +56,6 @@ configurations.all {
     //    +--- org.apache.httpcomponents:httpclient:4.5.12
     //    |    ...
     //
-    substitute module('commons-logging:commons-logging') because 'we want to control JCL logging with slf4j' with module("org.slf4j:jcl-over-slf4j:${depVersion.slf4j}")
+    substitute module('commons-logging:commons-logging') because 'we want to control JCL logging with slf4j' using module("org.slf4j:jcl-over-slf4j:${depVersion.slf4j}")
   }
 }

gradle/any/java-library.gradle

@@ -9,13 +9,13 @@ apply from: "$rootDir/gradle/any/spotless.gradle"
 apply plugin: 'maven-publish'
 
 def sourceJar = tasks.register('sourceJar', Jar) {
-  classifier 'sources'
+  setArchiveClassifier('sources')
   from sourceSets.main.allJava
 }
 
 def javadocJar = tasks.register('javadocJar', Jar) {
   dependsOn javadoc
-  classifier 'javadoc'
+  setArchiveClassifier('javadoc')
   from files(javadoc.destinationDir)
 }
 

gradle/any/shared-mvn-coords.gradle

@@ -9,7 +9,7 @@ ext {
   buildPlugins = [:]
   buildPlugins.shadow = 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   buildPlugins.sonarqube = 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0'
-  buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:4.5.1'
+  buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:5.17.1'
   buildPlugins.protobuf = 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
   buildPlugins.depcheck = 'org.owasp:dependency-check-gradle:8.2.1'
 

gradle/any/spotless.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'com.diffplug.gradle.spotless'
+apply plugin: 'com.diffplug.spotless'
 
 spotless {
   java {

gradle/root/spotless.gradle

@@ -2,7 +2,7 @@ if (!name.equals(rootProject.name)) {
   throw new GradleException("This script plugin should only be applied to the root project, not '$name'.")
 }
 
-apply plugin: 'com.diffplug.gradle.spotless'
+apply plugin: 'com.diffplug.spotless'
 
 spotless {
   format 'misc', {

gradle/root/testing.gradle

@@ -121,7 +121,7 @@ gradle.projectsEvaluated {
     description = 'Runs all subproject Test tasks'
     dependsOn subprojectTestTasks
     // If we run testAll, generate coverage report after all of the tests run
-    finalizedBy jacocoRootReport
+    //finalizedBy jacocoRootReport
   }
 
   task rootTestReport(type: TestReport, group: 'Reports') {
@@ -137,7 +137,7 @@ gradle.projectsEvaluated {
     //     ":grib:test" --finalizedBy--> ":rootTestReport" --dependsOn--> "all_subproject_Tests"
     // In other words, all subproject tests would get run, no matter what.
     // Passing File arguments to reportOn() instead doesn't create that dependency.
-    reportOn subprojectTestTasks*.binResultsDir
+    reportOn subprojectTestTasks*.binaryResultsDirectory
 
     // Wait until all Test tasks have run. This creates a task *ordering*, not a dependency.
     mustRunAfter subprojectTestTasks