Update Gradle, add Java stuff to --version

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'application'
     id 'org.openjfx.javafxplugin' version '0.0.14'
     id 'com.palantir.git-version' version '3.0.0' // for gitVersion()
+    id 'org.beryx.jlink' version '2.25.0'
  //    id 'com.gluonhq.client-gradle-plugin' version '0.1.42'
  //   id 'com.gluonhq.gluonfx-gradle-plugin' version '1.0.16'
 }
@@ -27,19 +28,26 @@ javafx {
     modules = ['javafx.controls', 'javafx.graphics', 'javafx.swing']
     //configuration = 'compileOnly'
 }
+
+jlink {
+    launcher {
+        name = 'nfc4pc'
+    }
+}
+
 //gluonClient {
 //    reflectionList = ["pro.javacard.nfc4pc.MainWrapper"]
 //}
 
 
 application {
-    mainClass = "$moduleName/pro.javacard.nfc4pc.MainWrapper"
     mainModule = "pro.javacard.nfc4pc"
+    mainClass = "pro.javacard.nfc4pc.MainWrapper"
 }
 
 jar {
     manifest {
-        attributes 'Main-Class': 'pro.javacard.nfc4pc.MainWrapper'
+        attributes 'Main-Class': application.mainClass
         attributes 'Implementation-Version': gitVersion()
     }
     from {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

src/main/java/pro/javacard/nfc4pc/CLIOptions.java

@@ -61,6 +61,8 @@ protected static OptionSet parseArguments(String[] argv) throws IOException {
         }
 
         if (args.has(OPT_VERSION)) {
+            if (args.has(OPT_DEBUG))
+                System.out.printf("# Running Java %s (%s) from %s on %s %s%n", System.getProperty("java.version"),  System.getProperty("os.arch"), System.getProperty("java.vendor"), System.getProperty("os.name"), System.getProperty("os.version"));
             System.out.println("NFC4PC version " + CLIOptions.class.getPackage().getImplementationVersion());
             System.exit(0);
         }