Merge pull request #1501 from lesserwhirls/gradle-kt

Upgrade to Gradle 9 and migrate to Kotlin DSL

Author: lesserwhirls

.github/workflows/deps.yml

@@ -6,11 +6,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: |
+            8
+            17
       - name: Build with Gradle (refresh dependencies)
         run: ./gradlew clean classes testClasses assemble --refresh-dependencies
       - name: Build sourceJars

.github/workflows/docs-tutorials.yml

@@ -7,11 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Java 8
-        uses: actions/setup-java@v4
+      - name: Setup Java 8, 17
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: |
+            8
+            17
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

.github/workflows/docs.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:

.github/workflows/style.yml

@@ -6,11 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
@@ -20,5 +20,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Code Style Check with Gradle and Spotless
+      - name: build-logic Code Style Check with Gradle and Spotless
+        run: ./gradlew :build-logic:clean :build-logic:spotlessCheck
+      - name: netCDF-Java Code Style Check with Gradle and Spotless
         run: ./gradlew clean spotlessCheck

.github/workflows/test-native-compression.yml

@@ -15,7 +15,6 @@ jobs:
           ubuntu-24.04,
           ubuntu-24.04-arm,
           windows-2022,
-          windows-11-arm,
           macos-13,
           macos-14,
           macos-15
@@ -24,15 +23,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        if: ${{ matrix.os != 'windows-11-arm' }}
-        uses: actions/setup-java@v4
+      - name: Setup JDK 8, 17
+        if: ${{ matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-13' }}
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
-      - name: Set up JDK 21
-        if: ${{ matrix.os == 'windows-11-arm' }}
-        uses: actions/setup-java@v4
+          java-version: |
+            8
+            17
+      - name: Setup JDK 21
+        if: ${{ matrix.os != 'ubuntu-24.04' && matrix.os != 'macos-13' }}
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -46,7 +47,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Run libaec JNA tests
-        run: ./gradlew clean :native-compression:libaec-jna:simpleTests
+        if: ${{ matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-13'  }}
+        run: ./gradlew -Dorg.gradle.java.installations.auto-detect=true clean :libaec-jna:test
+        env:
+          JDK8: /usr/thredds-test-environment/temurin8
+      - name: Run libaec JNA tests (JDK 21 tests)
+        if: ${{ matrix.os != 'ubuntu-24.04' && matrix.os != 'macos-13' }}
+        run: ./gradlew clean :libaec-jna:test21
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

.github/workflows/tests.yml

@@ -11,15 +11,21 @@ jobs:
         java-vendor: ['zulu', 'temurin', 'corretto']
     steps:
       - uses: actions/checkout@v4
-      - name: Build and test with Gradle (${{ matrix.java-vendor }} ${{ matrix.java-version }})
+      - name: Build with ${{ matrix.java-vendor }} 17 and run tests with ${{ matrix.java-vendor }} ${{ matrix.java-version }}
         uses: Unidata/thredds-test-action@v3
         with:
           java-vendor: ${{ matrix.java-vendor }}
-          java-version: ${{ matrix.java-version }}
+          java-version: 17
           build-tool: 'gradlew'
-          test-command: '--info --stacktrace testAll'
+          test-command: '-Dorg.gradle.java.installations.fromEnv=JDK8 --info --stacktrace test'
+        env:
+          JDK8: /usr/thredds-test-environment/${{ matrix.java-vendor }}8
+      - name: Prep for artifact upload
+        if: failure()
+        run: rm -rf build-logic/build/tmp
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: netCDF-Java_JUnit_Results_${{ github.sha }}_${{ matrix.java-vendor }}-${{ matrix.java-version }}
-          path: build/reports/allTests
+          path: |
+            ${{ github.workspace }}/**/build/reports/tests/**/*

.gitignore

@@ -32,8 +32,13 @@ bin/
 
 # Ignore the Gradle cache directory.
 .gradle/
+
+# Ignore .kotlin directories
+.kotlin/
+
 # Ignore the output that Gradle generates in the "build/" directories...
 build/
+
 # ...but not the source code in the "edu.ucar.build" package inside buildSrc
 !**/src/**/edu/ucar/build/
 

bufr/build.gradle

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 University Corporation for Atmospheric Research/Unidata
+ * See LICENSE for license information.
+ */
+
+plugins {
+  id("java-library-conventions")
+  id("protobuf-conventions")
+}
+
+description = "Reading BUFR files with the NetCDF-java library."
+
+extra["project.title"] = "BUFR IOSP"
+
+dependencies {
+  implementation(platform(project(":netcdf-java-platform")))
+
+  api(project(":cdm-core"))
+
+  implementation(libs.beust.jcommander)
+  implementation(libs.findbugs.jsr305)
+  implementation(libs.guava)
+  implementation(libs.jdom2)
+  implementation(libs.protobuf)
+  implementation(libs.re2j)
+  implementation(libs.slf4j.api)
+
+  testImplementation(platform(project(":netcdf-java-testing-platform")))
+
+  testImplementation(project(":cdm-test-utils"))
+
+  testImplementation(libs.google.truth)
+
+  testCompileOnly(libs.junit4)
+
+  testRuntimeOnly(libs.junit5.platformLauncher)
+  testRuntimeOnly(libs.junit5.vintageEngine)
+}

bufr/build.gradle.kts

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 University Corporation for Atmospheric Research/Unidata
+ * See LICENSE for license information.
+ */
+
+plugins {
+  `kotlin-dsl`
+  alias(libs.plugins.protobuf)
+  alias(libs.plugins.spotless)
+}
+
+dependencies {
+  implementation(plugin(libs.plugins.protobuf))
+  implementation(plugin(libs.plugins.spotless))
+}
+
+spotless {
+  kotlinGradle {
+    target("*.gradle.kts", "**/*.gradle.kts")
+    ktfmt().googleStyle()
+  }
+}
+
+// Helper function that transforms a plugin alias from the version catalog
+// into a valid dependency notation
+fun plugin(plugin: Provider<PluginDependency>) =
+  plugin.map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" }