Upgrade Gradle wrapper and GitHub actions versions

.github/workflows/main.yml

@@ -10,14 +10,14 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Install build dependencies
         run: brew install automake libtool nasm
       - name: Build native code
@@ -30,13 +30,13 @@ jobs:
           cd build
           ../configure --with-java
           make
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts-macos-arm64
           path: libjpeg-turbo/build/.libs/libturbojpeg.dylib
@@ -45,14 +45,14 @@ jobs:
     runs-on: macos-15-intel
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Install build dependencies
         run: brew install automake libtool nasm
       - name: Build native code
@@ -64,13 +64,13 @@ jobs:
           cd build
           ../configure --with-java
           make
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts-macos-x86_64
           path: libjpeg-turbo/build/.libs/libturbojpeg.dylib
@@ -79,20 +79,20 @@ jobs:
     runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         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
+      - uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts-linux-arm64
           path: libjpeg-turbo/build/.libs/libturbojpeg.so
@@ -101,20 +101,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Build native code
         run: |
           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@v4
+      - uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: configure log
           path: libjpeg-turbo/build/config.log
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts-linux-x86_64
           path: libjpeg-turbo/build/.libs/libturbojpeg.so
@@ -123,14 +123,14 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Install NASM
         uses: ilammy/setup-nasm@v1
       - name: Apply patches
@@ -145,7 +145,7 @@ jobs:
           cmake -DWITH_JAVA=ON ..
           cmake --build .
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts-windows-x86_64
           path: libjpeg-turbo/build/**/turbojpeg.dll
@@ -156,22 +156,22 @@ jobs:
     env:
       gradle_commands: --stacktrace clean jar
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '17'
       - name: Run commands
         run: |
           ./gradlew ${{ env.gradle_commands }}
       - name: Download artifacts from build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
       - name: List artifacts
         run: ls -R
       - name: Repack jar
         run: ./jar-pack.sh
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: libjpeg-turbo-java
           path: build/libs/*.jar
@@ -180,22 +180,22 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04-arm, ubuntu-latest, windows-latest, macos-15-intel, macos-latest]
-        java: [8, 11, 17, 21]
+        java: [17, 21, 25]
     runs-on: ${{ matrix.os }}
     env:
       gradle_commands: --stacktrace clean jar
       test_commands: --stacktrace test
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '${{ matrix.java }}'
       - name: Run commands
         run: |
           ./gradlew ${{ env.gradle_commands }}
       - name: Download artifacts from build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
       - 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
@@ -208,16 +208,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts from build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
       - 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
+        run: |
+          gh release create --generate-notes "${GITHUB_REF#refs/tags/}" \
+          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
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -5,10 +5,9 @@ plugins {
 group = 'com.glencoesoftware.turbojpeg'
 version = '0.1.0-SNAPSHOT'
 
-def mainClassName = 'com.glencoesoftware.turbojpeg.TJ'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+compileJava {
+    options.release = 11
+}
 
 repositories {
     mavenCentral()
@@ -33,8 +32,13 @@ dependencies {
 jar {
     manifest {
         attributes(
-            "Main-Class": mainClassName,
-            "Implementation-Version": version
+            "Created-By": "Gradle ${gradle.gradleVersion}",
+            "Build-Jdk": "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+            "Built-By": System.properties['user.name'],
+            "Built-On": new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+            "Main-Class": "com.glencoesoftware.turbojpeg.TJ",
+            "Implementation-Version": version,
+            "Implementation-Build": "git rev-parse --verify HEAD".execute().getText().trim()
         )
     }
 }

gradle/wrapper/gradle-wrapper.properties

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