Upgrade to gradle 8.13

.github/workflows/tests.yml

@@ -6,8 +6,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # test against latest 8, 11, 17 of zulu and temurin java
-        java-version: [8, 11, 17]
+        # test against latest 8, 11, 17, 21 of zulu and temurin java
+        java-version: [8, 11, 17, 21]
         java-vendor: ['zulu', 'temurin', 'corretto']
     steps:
       - uses: actions/checkout@v4

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

cdm-test-utils/src/main/java/ucar/unidata/util/test/UtilsTestStructureArray.java

@@ -75,8 +75,8 @@ private void testArrayStructureByRecno(ArrayStructure as) {
       List<StructureMembers.Member> members = sdata.getMembers();
       for (StructureMembers.Member m : members) {
         Array sdataArray = sdata.getArray(m);
-        assert (sdataArray.getElementType() == m.getDataType().getPrimitiveClassType()) : sdataArray.getElementType()
-            + " != " + m.getDataType().getPrimitiveClassType();
+        assert (sdataArray.getElementType() == m.getDataType().getPrimitiveClassType())
+            : sdataArray.getElementType() + " != " + m.getDataType().getPrimitiveClassType();
 
         Array sdataArray2 = sdata.getArray(m.getName());
         UtilsMa2Test.testEquals(sdataArray, sdataArray2);

cdm-test/src/test/java/ucar/nc2/dataset/TestTransforms.java

@@ -309,8 +309,8 @@ private VerticalTransform test(NetcdfDataset ncd, String levName, String varName
     // should be compatible with vunit
     if (vunit != null) {
       String vertCoordUnit = vt.getUnitString();
-      assert vunit.isCompatible(vertCoordUnit) : vertCoordUnit + " not udunits compatible with "
-          + vunit.getUnitString();
+      assert vunit.isCompatible(vertCoordUnit)
+          : vertCoordUnit + " not udunits compatible with " + vunit.getUnitString();
     }
 
     return vt;

cdm-test/src/test/java/ucar/nc2/ncml/TestNcMLStrides.java

@@ -100,8 +100,8 @@ public void testStride(String stride) throws IOException, InvalidRangeException
     Index ci = correct.getIndex();
     Index di = data.getIndex();
     for (int i = 0; i < data.getSize(); i++)
-      assert (data.getInt(di.set(i)) == correct.getInt(ci.set(i))) : stride + " index " + i + " = "
-          + data.getInt(di.set(i)) + " != " + correct.getInt(ci.set(i));
+      assert (data.getInt(di.set(i)) == correct.getInt(ci.set(i)))
+          : stride + " index " + i + " = " + data.getInt(di.set(i)) + " != " + correct.getInt(ci.set(i));
   }
 
 }

cdm/core/src/main/java/ucar/ma2/ArrayStructureMA.java

@@ -228,9 +228,9 @@ public static ArrayStructureMA factoryMA(ArrayStructure from) throws IOException
       if (numRecords == -1) {
         numRecords = firstDimLen;
       } else {
-        assert numRecords == firstDimLen : String.format(
-            "Expected all structure members to have the same first" + "dimension length, but %d != %d.", numRecords,
-            firstDimLen);
+        assert numRecords == firstDimLen
+            : String.format("Expected all structure members to have the same first" + "dimension length, but %d != %d.",
+                numRecords, firstDimLen);
       }
 
       memberArrayMap.put(m.getName(), array);

cdm/core/src/main/java/ucar/nc2/ft/point/standard/plug/CFpointObs.java

@@ -420,8 +420,8 @@ protected TableConfig getTimeSeriesProfileConfig(NetcdfDataset ds, EncodingInfo
             // zDim = z.getDimension(0);
           }
         } else { // 1d time
-          assert z.getRank() != 1
-              || !time.getDimension(0).equals(z.getDimension(0)) : "time and z dimensions must be different";
+          assert z.getRank() != 1 || !time.getDimension(0).equals(z.getDimension(0))
+              : "time and z dimensions must be different";
         }
 
         TableConfig profileTable = makeMultidimInner(ds, stationTable, info.childDim, info, errlog);

cdm/core/src/main/java/ucar/nc2/ft2/coverage/HorizCoordSys.java

@@ -756,8 +756,8 @@ private static int calcStride(int numTotal, int maxToInclude) {
     int stride = Math.max(1, (int) Math.ceil(numTotal / (double) maxToInclude));
     int numIncluded = (int) Math.ceil(numTotal / (double) stride);
 
-    assert numIncluded <= maxToInclude : String.format("We're set to include %d points, but we wanted a max of %d.",
-        numIncluded, maxToInclude);
+    assert numIncluded <= maxToInclude
+        : String.format("We're set to include %d points, but we wanted a max of %d.", numIncluded, maxToInclude);
     return stride;
   }
 
@@ -766,9 +766,9 @@ private static void assertNotExceedingMaxBoundaryPoints(int numBoundaryPoints, i
     // Widen to long to avoid possible overflow, because last two arguments will often be Integer.MAX_VALUE.
     long maxBoundaryPoints = 2 * (long) maxPointsInYEdge + 2 * (long) maxPointsInXEdge;
 
-    assert numBoundaryPoints <= maxBoundaryPoints : String.format(
-        "We should be returning a maximum of %d boundary points, but we're returning %d instead.", maxBoundaryPoints,
-        numBoundaryPoints);
+    assert numBoundaryPoints <= maxBoundaryPoints
+        : String.format("We should be returning a maximum of %d boundary points, but we're returning %d instead.",
+            maxBoundaryPoints, numBoundaryPoints);
   }
 
   /**

cdm/core/src/test/java/thredds/client/catalog/TestResolve.java

@@ -28,8 +28,8 @@ public void testResolve() throws IOException {
     logger.debug("ACD service= {}", s);
 
     assert getAccessURL(cat, "nest11").equals("http://www.acd.ucar.edu/dods/testServer/flux/CO2.nc");
-    assert getAccessURL(cat, "nest12").equals(base + "netcdf/data/flux/NO2.nc") : getAccessURL(cat, "nest12") + " != "
-        + ClientCatalogUtil.makeFilepath() + "netcdf/data/flux/NO2.nc";
+    assert getAccessURL(cat, "nest12").equals(base + "netcdf/data/flux/NO2.nc")
+        : getAccessURL(cat, "nest12") + " != " + ClientCatalogUtil.makeFilepath() + "netcdf/data/flux/NO2.nc";
 
     assert getMetadataURL(cat, "nest1", "NETCDF").equals("any.xml");
     assert getMetadataURL(cat, "nest1", "ADN").equals("http://you/corrupt.xml");

cdm/gcdm/build.gradle

@@ -82,6 +82,7 @@ task startDaemon(type: JavaExecFork) {
   stopAfter = test
   waitForPort = 16111
   waitForOutput = 'Server started, listening on 16111'
+  dependsOn testClasses
 }
 
 test.dependsOn(startDaemon)

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

@@ -7,9 +7,9 @@ ext {
 
   // plugin version management
   buildPlugins = [:]
-  buildPlugins.shadow = 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
+  buildPlugins.shadow = 'com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.5'
   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/fatJars.gradle

@@ -20,7 +20,7 @@ if (!name.equals(rootProject.name)) {
 
 // need this to resolve dependencies defined through the netcdf-java-platform project
 apply from: "$rootDir/gradle/any/dependencies.gradle"
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'com.gradleup.shadow'
 
 // todo: this indicates we need have too much logic in our script plugin
 // This script plugin is a candidate for moving into buildSrc.

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists