Merge pull request #1441 from lesserwhirls/gradle

Upgrade to gradle 8.13

Author: lesserwhirls

.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)