Merge branch 'master' into dependabot/gradle/org.ajoberstar.git-publish-5.1.1

Author: xzel23

.github/workflows/build-jlink-plugin.yml

@@ -9,18 +9,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
     - uses: actions/checkout@v5
-    - name: Set up JDK 17
+    - name: Set up additional JDK 25 (Temurin)
+      uses: actions/setup-java@v5
+      with:
+        java-version: '25'
+        distribution: 'temurin'
+    - name: Set up JDK 17 (default)
       uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'zulu'
-    - name: Gradle build
-      uses: gradle/gradle-build-action@v3
-      with:
-        arguments: build asciidoc --scan
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+    - name: Build and run asciidoc
+      run: ./gradlew build asciidoc --scan
     - name: Run publish if necessary
       if: runner.os == 'Linux' && github.ref == 'refs/heads/master' && github.event_name == 'push'
       env:
@@ -42,11 +47,7 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Publish Gradle Plugins
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: |
-            assemble
-            publishPlugins
-            -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }}
-            -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
+        run: ./gradlew assemble publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

.github/workflows/publish-plugin.yml

@@ -12,11 +12,7 @@ jobs:
         with:
           java-version: '17'
           distribution: 'zulu'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Publish Gradle Plugins
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: |
-            assemble
-            publishPlugins
-            -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }}
-            -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
+        run: ./gradlew assemble publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

build.gradle

@@ -3,16 +3,16 @@ import org.kohsuke.github.GitHub
 
 buildscript {
     dependencies {
-        classpath 'org.kohsuke:github-api:1.329'
+        classpath 'org.kohsuke:github-api:1.330'
     }
 }
 
 plugins {
     id 'groovy'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'com.gradle.plugin-publish' version '1.3.1'
+    id 'com.gradle.plugin-publish' version '2.0.0'
     id 'com.github.ethankhall.semantic-versioning' version '1.1.0'
-    id 'com.github.ben-manes.versions' version '0.52.0'
+    id 'com.github.ben-manes.versions' version '0.53.0'
     id 'com.github.hierynomus.license' version '0.16.1'
     id 'org.asciidoctor.jvm.convert' version '4.0.5'
 }
@@ -48,7 +48,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:9.8'
+    implementation 'org.ow2.asm:asm:9.9'
 
     testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
 

gradle.properties

@@ -1,5 +1,5 @@
-pluginVersionMajor = 3
-pluginVersionMinor = 1
-pluginVersionPatch = 4
-pluginVersionLabel = SNAPSHOT
-pluginReleaseBuild = false
+pluginVersionMajor = 3
+pluginVersionMinor = 1
+pluginVersionPatch = 4
+#pluginVersionLabel =
+pluginReleaseBuild = true

src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy

@@ -77,7 +77,11 @@ class JlinkTaskImpl extends BaseTaskImpl<JlinkTaskData> {
     @CompileDynamic
     void runJlink(File imageDir, String jdkHome, List<String> extraModulePaths, List<String> options) {
         if(!new File("$jdkHome/jmods/java.base.jmod").file) {
-            throw new GradleException("java.base module not found in $jdkHome${File.separator}jmods")
+            if (JavaVersion.get(jdkHome) < 24) {
+                throw new GradleException("java.base module not found in $jdkHome${File.separator}jmods")
+            } else {
+                LOGGER.warn("java.base module not found in $jdkHome${File.separator}jmods, assuming the used Java toolchain has enabled JEP 493")
+            }
         }
         project.delete(imageDir)
         def result = {

src/test/groovy/org/beryx/jlink/JlinkPluginSpec.groovy

@@ -153,9 +153,10 @@ class JlinkPluginSpec extends Specification {
         imageZipFile.exists()
 
         where:
-        projectDir                  | gradleVersion | imageDir  | imageZip      | expectedLauncherName
-        'hello-javafx'              | '7.4'         | 'helloFX' | 'helloFX.zip' | 'helloFX'
-        'hello-javafx-log4j-2.11.1' | '7.6'         | 'image'   | 'image.zip'   | 'helloFX'
+        projectDir                  | gradleVersion | imageDir        | imageZip            | expectedLauncherName
+        'hello-javafx'              | '7.4'         | 'helloFX'       | 'helloFX.zip'       | 'helloFX'
+        'hello-javafx-log4j-2.11.1' | '7.6'         | 'image'         | 'image.zip'         | 'helloFX'
+        'hello-javafx-jep493'       | '9.1.0'       | 'helloFXJep493' | 'helloFXJep493.zip' | 'helloFXJep493'
     }
 
     def "should adjust qualified opens in module-info"() {

src/test/resources/hello-javafx-jep493/build.gradle

@@ -0,0 +1,35 @@
+plugins {
+    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.1.0'
+    id 'org.beryx.jlink'
+}
+
+repositories {
+    mavenCentral()
+}
+
+java {
+    toolchain {
+        // Use Temurin (Adoptium) JDK 25 for the build
+        languageVersion = JavaLanguageVersion.of(25)
+    }
+}
+
+javafx {
+    modules = ['javafx.controls']
+}
+
+application {
+    mainClass = "org.example.HelloFXJpe493"
+}
+
+jlink {
+    imageName = 'helloFXJep493'
+    imageDir = file('foo') // ignored
+    imageZip = file('bar.zip') // ignored
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+    launcher {
+        name = 'helloFXJep493'
+        noConsole = true
+    }
+}

src/test/resources/hello-javafx-jep493/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'hellofxjep493'

src/test/resources/hello-javafx-jep493/src/main/java/module-info.java

@@ -0,0 +1,5 @@
+module hellofxJep493 {
+    requires javafx.controls;
+
+    exports org.example;
+}

src/test/resources/hello-javafx-jep493/src/main/java/org/example/HelloFXJep493.java

@@ -0,0 +1,22 @@
+package org.example;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+public class HelloFXJep493 extends Application {
+
+    @Override
+    public void start(Stage stage) {
+        StackPane pane = new StackPane(new Label("HelloFXJpe493"));
+        Scene scene = new Scene(pane, 300, 200);
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}