Build modernization

.github/workflows/main.yml

@@ -6,15 +6,15 @@ on:
   pull_request:
 
 jobs:
-  build-macos-x86_64:
+  build-macos-arm64:
     runs-on: macos-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -23,41 +23,98 @@ jobs:
       - name: Build native code
         run: |
           export CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin"
+          export CXXFLAGS="-I${JAVA_HOME}/include -static-libstdc++"
           cd libjpeg-turbo
           autoreconf -fiv
           mkdir build
           cd build
           ../configure --with-java
           make
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-macos-arm64
+          path: libjpeg-turbo/build/.libs/libturbojpeg.dylib
+          if-no-files-found: error
+  build-macos-x86_64:
+    runs-on: macos-15-intel
+    steps:
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - name: Install build dependencies
+        run: brew install automake libtool nasm
+      - name: Build native code
+        run: |
+          export CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin"
+          cd libjpeg-turbo
+          autoreconf -fiv
+          mkdir build
+          cd build
+          ../configure --with-java
+          make
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: configure log
+          path: libjpeg-turbo/build/config.log
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-macos-x86_64
           path: libjpeg-turbo/build/.libs/libturbojpeg.dylib
           if-no-files-found: error
+  build-linux-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build native code
+        run: |
+          docker build -f Dockerfile_aarch64 . -t native_builder
+          docker run -v $(pwd):/build --user ${UID} -t native_builder /build/linux.sh
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: configure log
+          path: libjpeg-turbo/build/config.log
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: artifacts-linux-arm64
+          path: libjpeg-turbo/build/.libs/libturbojpeg.so
+          if-no-files-found: error
   build-linux-x86_64:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Build native code
         run: |
-          docker build -f Dockerfile2010 . -t native_builder
+          docker build -f Dockerfile_x86_64 . -t native_builder
           docker run -v $(pwd):/build --user ${UID} -t native_builder /build/linux.sh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-linux-x86_64
           path: libjpeg-turbo/build/.libs/libturbojpeg.so
@@ -66,11 +123,11 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -88,54 +145,57 @@ jobs:
           cmake -DWITH_JAVA=ON ..
           cmake --build .
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts-windows-x86_64
           path: libjpeg-turbo/build/**/turbojpeg.dll
           if-no-files-found: error
   build-package:
-    needs: [build-macos-x86_64, build-windows-x86_64, build-linux-x86_64]
+    needs: [build-macos-arm64, build-macos-x86_64, build-windows-x86_64, build-linux-arm64, build-linux-x86_64]
     runs-on: ubuntu-latest
     env:
       gradle_commands: --stacktrace clean jar
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: '8'
       - name: Run commands
         run: |
           ./gradlew ${{ env.gradle_commands }}
       - name: Download artifacts from build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: List artifacts
         run: ls -R
       - name: Repack jar
         run: ./jar-pack.sh
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: libjpeg-turbo-java
           path: build/libs/*.jar
   test:
     needs: build-package
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-24.04-arm, ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
+        java: [8, 11, 17, 21]
     runs-on: ${{ matrix.os }}
     env:
       gradle_commands: --stacktrace clean jar
       test_commands: --stacktrace test
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          distribution: 'zulu'
+          java-version: '${{ matrix.java }}'
       - name: Run commands
         run: |
           ./gradlew ${{ env.gradle_commands }}
       - name: Download artifacts from build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: Move packed jar to build dir
         run: rm build/libs/libjpeg-turbo*.jar; mv libjpeg-turbo-java/libjpeg-turbo*.jar build/libs/
       - name: Run tests
@@ -148,14 +208,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts from build
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
       - name: List artifacts
         run: ls -R
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
+            artifacts-macos-arm64/*.dylib
             artifacts-macos-x86_64/*.dylib
+            artifacts-linux-arm64/*.so
             artifacts-linux-x86_64/*.so
             artifacts-windows-x86_64/Debug/*.dll
             libjpeg-turbo-java/*.jar

Dockerfile2010 → Dockerfile_aarch64

@@ -1,6 +1,6 @@
 # Dockerfile for lowest common denominator Linux native artifact build
 # --------------------------------------------------------------------
 # Cribbed from TileDB-Java/ci/Dockerfile2010
-FROM quay.io/pypa/manylinux2010_x86_64
+FROM quay.io/pypa/manylinux_2_28_aarch64
 
-RUN yum install -y java-1.8.0-openjdk-devel
+RUN yum install -y java-11-openjdk-devel

Dockerfile_x86_64

@@ -0,0 +1,6 @@
+# Dockerfile for lowest common denominator Linux native artifact build
+# --------------------------------------------------------------------
+# Cribbed from TileDB-Java/ci/Dockerfile2010
+FROM quay.io/pypa/manylinux_2_28_x86_64
+
+RUN yum install -y java-11-openjdk-devel

build.gradle

@@ -11,11 +11,11 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    testImplementation "org.scijava:native-lib-loader:2.1.4"
+    testImplementation "org.scijava:native-lib-loader:2.4.0"
     testRuntimeOnly "org.slf4j:slf4j-api:1.7.6"
 
     // https://github.com/junit-team/junit5-samples/blob/master/junit5-migration-gradle/build.gradle

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists