Gradle build updates

.github/dependabot.yml

@@ -2,13 +2,8 @@ version: 2
 updates:
   - package-ecosystem: gradle
     directories:
-      - "/build-logic"   # Build-related logic for gradle
-      - "/jabgui"        # JabRef's GUI
-      - "/jabkit"        # JabRef's CLI ("JabKit")
-      - "/jablib"        # Core library
-      - "/jabsrv"        # Server-related module
-      - "/jabsrv-cli"    # CLI for the server
-      - "/test-support"  # Module for test utilities
+      - "/build-logic"   # versions of 3rd party gradle plugins
+      - "/versions"      # versions of 3rd party dependencies of all JabRef modules
     schedule:
       interval: weekly
     labels:

.github/workflows/binaries-ea.yml

@@ -119,9 +119,8 @@ jobs:
     needs: [conditions]
     if: ${{ needs.conditions.outputs.should-build == 'true' }}
     env:
-      javafx: '25'
-      jdk_version: '25'
-      jdk: 'openjdk-25.0.0-ea+21'
+      jdk_version: '24'
+      jdk_distribution: 'openjdk-25.0.0-ea+27'
     strategy:
       fail-fast: false
       matrix:
@@ -181,37 +180,47 @@ jobs:
       - name: Tell gradle to use JDK ${{ env.jdk_version }} (linux, Windows)
         if: ${{ !startsWith(matrix.os, 'macos') }}
         run: |
-          sed -i "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
-          sed -i "s#vendor = JvmVendorSpec.AMAZON##" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
-          cat build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
+          # Update JavaLanguageVersion
+          sed -i "s/JavaLanguageVersion.of..../JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+
+          # Update options.release
+          sed -i "s/options\.release = ../options.release = ${{ env.jdk_version }}/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+
+          # Use default vendor
+          # sed -i "s#vendor = JvmVendorSpec\..*##" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+
+          cat build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
       - name: Tell gradle to use JDK ${{ env.jdk_version }} (macOS)
         if: ${{ startsWith(matrix.os, 'macos') }}
         run: |
-          sed -i '.bak' "s/JavaLanguageVersion.of(24)/JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
-          sed -i '.bak' "s#vendor = JvmVendorSpec.AMAZON##" build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
-          cat build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
+          sed -i '.bak' "s/JavaLanguageVersion.of..../JavaLanguageVersion.of(${{ env.jdk_version }})/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+          sed -i '.bak' "s/options\.release = ../options.release = ${{ env.jdk_version }}/" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+          # sed -i '.bak' "s#vendor = JvmVendorSpec\..*##" build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
+          cat build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts
 
       # region setup-JDK
       - name: Setup JDK ${{ env.jdk_version }} (${{ env.jdk }}) for "java toolchain" of Gradle
+        if: false
         uses: jdx/mise-action@v2
         with:
           mise_toml: |
             [tools]
-            java = { version = "${{ env.jdk }}", release_type = "ea" }
+            java = { version = "${{ env.jdk_distribution }}", release_type = "ea" }
       - name: Debug
+        if: false
         shell: bash
         run: |
           set -x
           set -e
           echo $JAVA_HOME
           java --version
       - name: Make JDK known to gradle (Linux, macOS)
-        if: (matrix.os != 'windows-latest')
+        if: false && (matrix.os != 'windows-latest')
         shell: bash
         # Hint by https://github.com/gradle/gradle/issues/29355#issuecomment-2598556970
         run: ln -s ~/.local/share/mise ~/.asdf
       - name: Make JDK known to gradle (Windows)
-        if: (matrix.os == 'windows-latest')
+        if: false && (matrix.os == 'windows-latest')
         shell: bash
         run: mv ~/AppData/Local/mise ~/.asdf
       - name: Setup JDK for gradle itself
@@ -222,94 +231,27 @@ jobs:
       # endregion
 
       # region JavaFX
-      - name: Download and extract JavaFX ${{ env.javafx }}
-        if: (matrix.os != 'ubuntu-22.04-arm')
+      - name: 'Determine latest JavaFX version'
+        id: javafx
         shell: bash
         run: |
           set -e
-          set -x
-          mkdir javafx
-          cd javafx
-          curl --no-progress-meter https://jdk.java.net/javafx${{ env.javafx }}/ > javafx.html
-
-          case "${{ matrix.os }}" in
-            "ubuntu-22.04")
-              OS="linux-x64"
-              EXTRACT="tar xzf *.tar.gz"
-              EXT="tar.gz"
-              ;;
-            "windows-latest")
-              OS="windows-x64"
-              EXTRACT="unzip -qq *.zip"
-              EXT="zip"
-              ;;
-            "macos-13")
-              OS="macos-x64"
-              EXTRACT="tar xzf *.tar.gz"
-              EXT="tar.gz"
-              ;;
-            "macos-14")
-              OS="macos-aarch64"
-              EXTRACT="tar xzf *.tar.gz"
-              EXT="tar.gz"
-              ;;
-            *)
-              echo "Unsupported OS"
-              exit 1
-              ;;
-          esac
-          echo "OS set to $OS"
-
-          URL_SDK=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}_bin-sdk.${EXT}" javafx.html | head -n 1)
-          echo "Downloading $URL_SDK..."
-          curl -OJ --no-progress-meter $URL_SDK
-          $EXTRACT
-          rm *.$EXT
-
-          URL_JMODS=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}_bin-jmods.${EXT}" javafx.html | head -n 1)
-          echo "Downloading $URL_JMODS..."
-          curl -OJ --no-progress-meter $URL_JMODS
-          $EXTRACT
-          rm *.$EXT
-
-          ls -la
-      - name: 'Set JavaFX ${{ env.javafx }} (linux, Windows)'
+          curl -s "https://search.maven.org/solrsearch/select?q=g:org.openjfx+AND+a:javafx&rows=10&core=gav" > /tmp/versions.json
+          jq '[.response.docs[] | select(.v | test(".*-ea\\+.*")) | select(.v | test("^17|^18|^19|^20|^21|^22|^23") | not) | {version: .v}] | group_by(.version | capture("^(?<major>\\d+).*").major) | map(max_by(.version))' < /tmp/versions.json > /tmp/versions-latest.json
+          JAVAFX=$(jq -r '.[-1].version' /tmp/versions-latest.json)
+          echo "Using JavaFX ${JAVAFX}"
+          echo "version=${JAVAFX}" >> $GITHUB_OUTPUT
+      - name: 'Set JavaFX ${{ steps.javafx.output.version }} (linux, Windows)'
         if: ${{ !startsWith(matrix.os, 'macos') }}
         shell: bash
         run: |
           set -e
-          shopt -s globstar
-          for buildgradle in **/build.gradle.kts; do
-            sed -i '/javafx {/{n;s#version = ".*"#sdk = "../javafx/javafx-sdk-${{ env.javafx }}"#}' $buildgradle
-            sed -i "s#jlink {#jlink { addExtraModulePath(\"../javafx/javafx-jmods-${{ env.javafx }}\")#" $buildgradle
-            echo "=========="
-            echo $buidgradle
-            echo "=========="
-            cat $buildgradle
-          done
-      - name: 'Set JavaFX ${{ env.javafx }} (macOS)'
+          sed -i 's/val javafx = ".*/val javafx = "${{ steps.javafx.outputs.version }}"/' versions/build.gradle.kts
+      - name: 'Set JavaFX ${{ steps.javafx.output.version }} (macOS)'
         if: startsWith(matrix.os, 'macos')
         run: |
           set -e
-          find . -name 'build.gradle.kts' | while read -r buildgradle; do
-            sed -i '.bak' -e '/javafx {/{n' -e 's#version = ".*"#sdk = "../javafx/javafx-sdk-${{ env.javafx }}"#;}' $buildgradle
-            sed -i '.bak' -e "s#jlink {#jlink { addExtraModulePath(\"../javafx/javafx-jmods-${{ env.javafx }}\")#" $buildgradle
-            cat $buildgradle
-          done
-      - name: 'Set JavaFX ${{ env.javafx }} (linux-arm)'
-        if: (matrix.os == 'ubuntu-22.04-arm')
-        # No JavaFX EA build for ARM at https://jdk.java.net/javafx25/, therefore using Maven Central artifact
-        run: |
-          set -e
-          curl -s "https://search.maven.org/solrsearch/select?q=g:org.openjfx+AND+a:javafx&rows=10&core=gav" > /tmp/versions.json
-          jq '[.response.docs[] | select(.v | test(".*-ea\\+.*")) | select(.v | test("^17|^18|^19|^20|^21|^22") | not) | {version: .v}] | group_by(.version | capture("^(?<major>\\d+).*").major) | map(max_by(.version))' < /tmp/versions.json > /tmp/versions-latest.json
-          JAVAFX=$(jq -r '.[-1].version' /tmp/versions-latest.json)
-          echo "Using JavaFX ${JAVAFX}"
-          shopt -s globstar
-          for buildgradle in **/build.gradle.kts; do
-            sed -i "/javafx {/{n;s#version = \".*\"#version = \"${JAVAFX}\"#}" $buildgradle
-            cat $buildgradle
-          done
+          sed -i '.bak' 's/val javafx = ".*/val javafx = "${{ steps.javafx.outputs.version }}"/' versions/build.gradle.kts
       # endregion
 
       - name: Setup Gradle

.github/workflows/binaries.yml

@@ -192,7 +192,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: '24'
-          distribution: 'liberica'
+          distribution: 'corretto'
           java-package: 'jdk'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

.github/workflows/tests.yml

@@ -209,6 +209,21 @@ jobs:
         with:
           java-version: 24.0.1
           distribution: 'zulu'
+      - name: Generate JBang cache key
+        id: cache-key
+        shell: bash
+        run: |
+          echo "cache_key=jbang-$(date +%F)" >> $GITHUB_OUTPUT
+      - name: Use cache
+        uses: actions/cache@v4
+        with:
+          lookup-only: true
+          path: ~/.jbang
+          key: ${{ steps.cache-key.outputs.cache_key }}
+          restore-keys:
+            jbang-
+      - name: Setup JBang
+        uses: jbangdev/setup-jbang@main
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Run ${{ matrix.module }} tests

.gitignore

@@ -562,7 +562,7 @@ gradle-app.setting
 ## !! KEEP THESE LINES !!
 
 # we really version .jar files - needs to be go after the www.gitignore.io-generated ones, because they ignore *.jar files
-!/lib/*.jar
+!/jablib/lib/**/*.jar
 
 # do not distribute Oracle's JDBC driver
 lib/ojdbc.jar

build-logic/build.gradle.kts

@@ -9,24 +9,11 @@ repositories {
 }
 
 dependencies {
+    implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
+    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.18.0")
+    implementation("com.github.andygoossens:gradle-modernizer-plugin:1.11.0")
     implementation("org.gradlex:extra-java-module-info:1.12")
     implementation("org.gradlex:java-module-packaging:1.0.1") // required for platform-specific packaging of JavaFX dependencies
     implementation("org.gradlex:java-module-testing:1.7")
-    implementation("org.gradlex.jvm-dependency-conflict-resolution:org.gradlex.jvm-dependency-conflict-resolution.gradle.plugin:2.4")
-
-    configurations
-        .matching { it.name.contains("downloadSources") }
-        .configureEach {
-            attributes {
-                attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, Usage.JAVA_RUNTIME))
-                attribute(
-                    OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE,
-                    objects.named(OperatingSystemFamily::class.java, DefaultNativePlatform.getCurrentOperatingSystem().name)
-                )
-                attribute(
-                    MachineArchitecture.ARCHITECTURE_ATTRIBUTE,
-                    objects.named(MachineArchitecture::class.java, DefaultNativePlatform.getCurrentArchitecture().name)
-                )
-            }
-        }
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
 }