Use Java 21 preview features

Author: airsquared

.gitignore

@@ -144,3 +144,5 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
+
+.vscode

.idea/misc.xml

@@ -41,6 +41,7 @@ var os = DefaultNativePlatform.currentOperatingSystem
 startScripts.enabled = distZip.enabled = distTar.enabled = false
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+tasks.withType(JavaCompile).forEach {it.options.compilerArgs.add '--enable-preview' }
 
 repositories {
     mavenCentral()
@@ -74,7 +75,7 @@ compileJava {
 application {
     mainModule = 'airsquared.blobsaver'
     mainClass = 'airsquared.blobsaver.app.Main'
-    applicationDefaultJvmArgs.add addExports
+    applicationDefaultJvmArgs.addAll '--enable-preview', addExports
 }
 
 var jarDirectory = os.isMacOsX() ? 'macos/Contents' : os.isWindows() ? 'windows/files' : 'linux'
@@ -87,6 +88,7 @@ run {
 test {
     useJUnitPlatform()
     systemProperty 'jar.directory', jarDirectory
+    jvmArgs '--enable-preview'
 }
 
 jlink {
@@ -95,7 +97,7 @@ jlink {
                 '--dedup-legal-notices=error-if-not-same-content'
     }
     launcher {
-        jvmArgs = [ '-Djar.directory={{BIN_DIR}}', addExports ]
+        jvmArgs = [ '--enable-preview', '-Djar.directory={{BIN_DIR}}', addExports ]
         if (findProperty('noConsole') != 'false') {
             noConsole = true
         }

build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -145,15 +145,15 @@ 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
+        # shellcheck disable=SC2039,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
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # 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"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -83,11 +83,11 @@ private static void collect(String page) {
         if (Prefs.getDisableAnalytics()) {
             return;
         }
-        sendRequest(getBaseUrl() + "&t=pageview&dl=" + encode(page) + "&an=blobsaver&av=" + encode(Main.appVersion) + "&ul=" + encode(Locale.getDefault().toLanguageTag()));
+        sendRequest(STR."\{getBaseUrl()}&t=pageview&dl=\{encode(page)}&an=blobsaver&av=\{encode(Main.appVersion)}&ul=\{encode(Locale.getDefault().toLanguageTag())}");
     }
 
     private static String getBaseUrl() {
-        return "http://www.google-analytics.com/collect?v=1&aip=1&ds=app&tid=" + trackingID + "&cid=" + getUUID();
+        return STR."http://www.google-analytics.com/collect?v=1&aip=1&ds=app&tid=\{trackingID}&cid=\{getUUID()}";
     }
 
     private static String getUUID() {

src/main/java/airsquared/blobsaver/app/Analytics.java

@@ -52,23 +52,25 @@ class Background {
     private static void macosBackgroundFile() {
         long interval = Prefs.getBackgroundTimeUnit().toSeconds(Prefs.getBackgroundInterval());
         //language=XML
-        String plist = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-                "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" +
-                "<plist>" +
-                "<dict>" +
-                "<key>Label</key>" +
-                "<string>" + backgroundLabel + "</string>" +
-                "<key>ProgramArguments</key>" +
-                "<array>" +
-                "  <string>" + executablePath() + "</string>" +
-                "  <string>--background-autosave</string>" +
-                "</array>" +
-                "<key>RunAtLoad</key>" +
-                "<true/>" +
-                "<key>StartInterval</key>" +
-                "<integer>" + interval + "</integer>" +
-                "</dict>" +
-                "</plist>";
+        String plist = STR."""
+                <?xml version="1.0" encoding="UTF-8"?>
+                <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+                <plist>
+                <dict>
+                <key>Label</key>
+                <string>\{backgroundLabel}</string>
+                <key>ProgramArguments</key>
+                <array>
+                  <string>\{executablePath()}</string>
+                  <string>--background-autosave</string>
+                </array>
+                <key>RunAtLoad</key>
+                <true/>
+                <key>StartInterval</key>
+                <integer>\{interval}</integer>
+                </dict>
+                </plist>
+                """;
         try {
             Files.createDirectories(plistFilePath.getParent());
             Files.writeString(plistFilePath, plist);
@@ -79,24 +81,24 @@ private static void macosBackgroundFile() {
     }
 
     private static void linuxBackgroundFile() {
-        String service = """
+        String service = STR."""
                 [Unit]
                 Description=Save blobs in the background
 
                 [Service]
                 Type=oneshot
-                ExecStart=%s --background-autosave""".formatted(executablePath());
-        String timer = """
+                ExecStart=\{executablePath()} --background-autosave""";
+        String timer = STR."""
                 [Unit]
                 Description=Save blobs in the background
                                 
                 [Timer]
                 OnBootSec=1min
-                OnUnitInactiveSec=%dmin
+                OnUnitInactiveSec=\{Prefs.getBackgroundIntervalMinutes()}min
                                 
                 [Install]
                 WantedBy=timers.target
-                """.formatted(Prefs.getBackgroundIntervalMinutes());
+                """;
         try {
             Files.createDirectories(systemdDir);
             Files.writeString(systemdDir.resolve("blobsaver.service"), service);
@@ -108,34 +110,34 @@ private static void linuxBackgroundFile() {
     }
 
     private static Path windowsBackgroundFile() {
-        String xml = """
+        String xml = STR."""
                 <?xml version="1.0" encoding="UTF-16"?>
                 <Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
                   <RegistrationInfo>
                     <Author>airsquared</Author>
                     <Description>Save blobs in the background</Description>
-                    <URI>%1$s</URI>
+                    <URI>\{windowsTaskName}</URI>
                   </RegistrationInfo>
                   <Triggers>
                     <LogonTrigger>
                       <Repetition>
-                        <Interval>PT%2$dM</Interval>
+                        <Interval>PT\{Prefs.getBackgroundIntervalMinutes()}M</Interval>
                         <StopAtDurationEnd>false</StopAtDurationEnd>
                       </Repetition>
                       <Enabled>true</Enabled>
-                      <UserId>%3$s</UserId>
+                      <UserId>\{System.getProperty("user.name")}</UserId>
                     </LogonTrigger>
                     <RegistrationTrigger>
                       <Repetition>
-                        <Interval>PT%2$dM</Interval>
+                        <Interval>PT\{Prefs.getBackgroundIntervalMinutes()}M</Interval>
                         <StopAtDurationEnd>false</StopAtDurationEnd>
                       </Repetition>
                       <Enabled>true</Enabled>
                     </RegistrationTrigger>
                   </Triggers>
                   <Principals>
                     <Principal id="Author">
-                      <UserId>%3$s</UserId>
+                      <UserId>\{System.getProperty("user.name")}</UserId>
                       <LogonType>InteractiveToken</LogonType>
                       <RunLevel>LeastPrivilege</RunLevel>
                     </Principal>
@@ -163,12 +165,12 @@ private static Path windowsBackgroundFile() {
                   </Settings>
                   <Actions Context="Author">
                     <Exec>
-                      <Command>"%4$s"</Command>
+                      <Command>"\{executablePath()}"</Command>
                       <Arguments>--background-autosave</Arguments>
                     </Exec>
                   </Actions>
                 </Task>
-                """.formatted(windowsTaskName, Prefs.getBackgroundIntervalMinutes(), System.getProperty("user.name"), executablePath());
+                """;
         try {
             Path path = Files.createTempFile("blobsaver_background_service", ".xml");
             Files.writeString(path, xml);

src/main/java/airsquared/blobsaver/app/Background.java

@@ -126,26 +126,26 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma
         }
         if (removeDevice != null) {
             removeDevice.delete();
-            System.out.println("Deleted " + removeDevice + ".");
+            System.out.println(STR."Deleted \{removeDevice}.");
         }
         if (saveDevice != null) {
             checkArgs("ecid", "save-path", "identifier");
             var saved = new Prefs.SavedDeviceBuilder(saveDevice)
                     .setIdentifier(device).setEcid(ecid).setSavePath(savePath.getCanonicalPath()).setBoardConfig(boardConfig)
                     .setApnonce(apnonce).setGenerator(generator).setIncludeBetas(version.includeBetas).save();
-            System.out.println(success("Saved " + saved + "."));
+            System.out.println(success(STR."Saved \{saved}."));
         }
         if (enableBackground != null) {
             if (!saveBlobs) {
                 System.out.println("Testing device\n");
                 Background.saveBlobs(enableBackground);
             }
             enableBackground.setBackground(true);
-            System.out.println(success("\nEnabled background for " + enableBackground + "."));
+            System.out.println(success(STR."\nEnabled background for \{enableBackground}."));
         }
         if (disableBackground != null) {
             disableBackground.setBackground(false);
-            System.out.println("Disabled background for " + enableBackground + ".");
+            System.out.println(STR."Disabled background for \{enableBackground}.");
         }
         if (backgroundControls.startBackground) {
             Background.startBackground();
@@ -251,7 +251,7 @@ public String[] getVersion() {
                 if (Main.appVersion.equals(newVersion.version())) {
                     output[3] = "%nYou are on the latest version.";
                 } else {
-                    output[3] = "%nNew Update Available: " + newVersion + ". Update using your package manager or at%n https://github.com/airsquared/blobsaver/releases";
+                    output[3] = STR."%nNew Update Available: \{newVersion}. Update using your package manager or at%n https://github.com/airsquared/blobsaver/releases";
                 }
             } catch (Exception e) {
                 output[3] = "%nUnable to check for updates.";
@@ -262,7 +262,7 @@ public String[] getVersion() {
     }
 
     private static String success(String s) {
-        return Help.Ansi.AUTO.string("@|bold,green " + s + "|@");
+        return Help.Ansi.AUTO.string(STR."@|bold,green \{s}|@");
     }
 
     private void checkArgs(String... names) {