Skip to content

Commit 3ae99c4

Browse files
airsquaredairsquared
committed
Use Java 21 preview features
1 parent 2e591e5 commit 3ae99c4

File tree

11 files changed

+92
-91
lines changed

11 files changed

+92
-91
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,5 @@ gradle-app.setting
144144

145145
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
146146
# gradle/wrapper/gradle-wrapper.properties
147+
148+
.vscode

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var os = DefaultNativePlatform.currentOperatingSystem
4141
startScripts.enabled = distZip.enabled = distTar.enabled = false
4242

4343
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
44+
tasks.withType(JavaCompile).forEach {it.options.compilerArgs.add '--enable-preview' }
4445

4546
repositories {
4647
mavenCentral()
@@ -74,7 +75,7 @@ compileJava {
7475
application {
7576
mainModule = 'airsquared.blobsaver'
7677
mainClass = 'airsquared.blobsaver.app.Main'
77-
applicationDefaultJvmArgs.add addExports
78+
applicationDefaultJvmArgs.addAll '--enable-preview', addExports
7879
}
7980

8081
var jarDirectory = os.isMacOsX() ? 'macos/Contents' : os.isWindows() ? 'windows/files' : 'linux'
@@ -87,6 +88,7 @@ run {
8788
test {
8889
useJUnitPlatform()
8990
systemProperty 'jar.directory', jarDirectory
91+
jvmArgs '--enable-preview'
9092
}
9193

9294
jlink {
@@ -95,7 +97,7 @@ jlink {
9597
'--dedup-legal-notices=error-if-not-same-content'
9698
}
9799
launcher {
98-
jvmArgs = [ '-Djar.directory={{BIN_DIR}}', addExports ]
100+
jvmArgs = [ '--enable-preview', '-Djar.directory={{BIN_DIR}}', addExports ]
99101
if (findProperty('noConsole') != 'false') {
100102
noConsole = true
101103
}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+7-7
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ private static void collect(String page) {
8383
if (Prefs.getDisableAnalytics()) {
8484
return;
8585
}
86-
sendRequest(getBaseUrl() + "&t=pageview&dl=" + encode(page) + "&an=blobsaver&av=" + encode(Main.appVersion) + "&ul=" + encode(Locale.getDefault().toLanguageTag()));
86+
sendRequest(STR."\{getBaseUrl()}&t=pageview&dl=\{encode(page)}&an=blobsaver&av=\{encode(Main.appVersion)}&ul=\{encode(Locale.getDefault().toLanguageTag())}");
8787
}
8888

8989
private static String getBaseUrl() {
90-
return "http://www.google-analytics.com/collect?v=1&aip=1&ds=app&tid=" + trackingID + "&cid=" + getUUID();
90+
return STR."http://www.google-analytics.com/collect?v=1&aip=1&ds=app&tid=\{trackingID}&cid=\{getUUID()}";
9191
}
9292

9393
private static String getUUID() {

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

+32-30
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,25 @@ class Background {
5252
private static void macosBackgroundFile() {
5353
long interval = Prefs.getBackgroundTimeUnit().toSeconds(Prefs.getBackgroundInterval());
5454
//language=XML
55-
String plist = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
56-
"<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" +
57-
"<plist>" +
58-
"<dict>" +
59-
"<key>Label</key>" +
60-
"<string>" + backgroundLabel + "</string>" +
61-
"<key>ProgramArguments</key>" +
62-
"<array>" +
63-
" <string>" + executablePath() + "</string>" +
64-
" <string>--background-autosave</string>" +
65-
"</array>" +
66-
"<key>RunAtLoad</key>" +
67-
"<true/>" +
68-
"<key>StartInterval</key>" +
69-
"<integer>" + interval + "</integer>" +
70-
"</dict>" +
71-
"</plist>";
55+
String plist = STR."""
56+
<?xml version="1.0" encoding="UTF-8"?>
57+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
58+
<plist>
59+
<dict>
60+
<key>Label</key>
61+
<string>\{backgroundLabel}</string>
62+
<key>ProgramArguments</key>
63+
<array>
64+
<string>\{executablePath()}</string>
65+
<string>--background-autosave</string>
66+
</array>
67+
<key>RunAtLoad</key>
68+
<true/>
69+
<key>StartInterval</key>
70+
<integer>\{interval}</integer>
71+
</dict>
72+
</plist>
73+
""";
7274
try {
7375
Files.createDirectories(plistFilePath.getParent());
7476
Files.writeString(plistFilePath, plist);
@@ -79,24 +81,24 @@ private static void macosBackgroundFile() {
7981
}
8082

8183
private static void linuxBackgroundFile() {
82-
String service = """
84+
String service = STR."""
8385
[Unit]
8486
Description=Save blobs in the background
8587
8688
[Service]
8789
Type=oneshot
88-
ExecStart=%s --background-autosave""".formatted(executablePath());
89-
String timer = """
90+
ExecStart=\{executablePath()} --background-autosave""";
91+
String timer = STR."""
9092
[Unit]
9193
Description=Save blobs in the background
9294
9395
[Timer]
9496
OnBootSec=1min
95-
OnUnitInactiveSec=%dmin
97+
OnUnitInactiveSec=\{Prefs.getBackgroundIntervalMinutes()}min
9698
9799
[Install]
98100
WantedBy=timers.target
99-
""".formatted(Prefs.getBackgroundIntervalMinutes());
101+
""";
100102
try {
101103
Files.createDirectories(systemdDir);
102104
Files.writeString(systemdDir.resolve("blobsaver.service"), service);
@@ -108,34 +110,34 @@ private static void linuxBackgroundFile() {
108110
}
109111

110112
private static Path windowsBackgroundFile() {
111-
String xml = """
113+
String xml = STR."""
112114
<?xml version="1.0" encoding="UTF-16"?>
113115
<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
114116
<RegistrationInfo>
115117
<Author>airsquared</Author>
116118
<Description>Save blobs in the background</Description>
117-
<URI>%1$s</URI>
119+
<URI>\{windowsTaskName}</URI>
118120
</RegistrationInfo>
119121
<Triggers>
120122
<LogonTrigger>
121123
<Repetition>
122-
<Interval>PT%2$dM</Interval>
124+
<Interval>PT\{Prefs.getBackgroundIntervalMinutes()}M</Interval>
123125
<StopAtDurationEnd>false</StopAtDurationEnd>
124126
</Repetition>
125127
<Enabled>true</Enabled>
126-
<UserId>%3$s</UserId>
128+
<UserId>\{System.getProperty("user.name")}</UserId>
127129
</LogonTrigger>
128130
<RegistrationTrigger>
129131
<Repetition>
130-
<Interval>PT%2$dM</Interval>
132+
<Interval>PT\{Prefs.getBackgroundIntervalMinutes()}M</Interval>
131133
<StopAtDurationEnd>false</StopAtDurationEnd>
132134
</Repetition>
133135
<Enabled>true</Enabled>
134136
</RegistrationTrigger>
135137
</Triggers>
136138
<Principals>
137139
<Principal id="Author">
138-
<UserId>%3$s</UserId>
140+
<UserId>\{System.getProperty("user.name")}</UserId>
139141
<LogonType>InteractiveToken</LogonType>
140142
<RunLevel>LeastPrivilege</RunLevel>
141143
</Principal>
@@ -163,12 +165,12 @@ private static Path windowsBackgroundFile() {
163165
</Settings>
164166
<Actions Context="Author">
165167
<Exec>
166-
<Command>"%4$s"</Command>
168+
<Command>"\{executablePath()}"</Command>
167169
<Arguments>--background-autosave</Arguments>
168170
</Exec>
169171
</Actions>
170172
</Task>
171-
""".formatted(windowsTaskName, Prefs.getBackgroundIntervalMinutes(), System.getProperty("user.name"), executablePath());
173+
""";
172174
try {
173175
Path path = Files.createTempFile("blobsaver_background_service", ".xml");
174176
Files.writeString(path, xml);

‎src/main/java/airsquared/blobsaver/app/CLI.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -126,26 +126,26 @@ public Void call() throws TSS.TSSException, IOException, InvalidPreferencesForma
126126
}
127127
if (removeDevice != null) {
128128
removeDevice.delete();
129-
System.out.println("Deleted " + removeDevice + ".");
129+
System.out.println(STR."Deleted \{removeDevice}.");
130130
}
131131
if (saveDevice != null) {
132132
checkArgs("ecid", "save-path", "identifier");
133133
var saved = new Prefs.SavedDeviceBuilder(saveDevice)
134134
.setIdentifier(device).setEcid(ecid).setSavePath(savePath.getCanonicalPath()).setBoardConfig(boardConfig)
135135
.setApnonce(apnonce).setGenerator(generator).setIncludeBetas(version.includeBetas).save();
136-
System.out.println(success("Saved " + saved + "."));
136+
System.out.println(success(STR."Saved \{saved}."));
137137
}
138138
if (enableBackground != null) {
139139
if (!saveBlobs) {
140140
System.out.println("Testing device\n");
141141
Background.saveBlobs(enableBackground);
142142
}
143143
enableBackground.setBackground(true);
144-
System.out.println(success("\nEnabled background for " + enableBackground + "."));
144+
System.out.println(success(STR."\nEnabled background for \{enableBackground}."));
145145
}
146146
if (disableBackground != null) {
147147
disableBackground.setBackground(false);
148-
System.out.println("Disabled background for " + enableBackground + ".");
148+
System.out.println(STR."Disabled background for \{enableBackground}.");
149149
}
150150
if (backgroundControls.startBackground) {
151151
Background.startBackground();
@@ -251,7 +251,7 @@ public String[] getVersion() {
251251
if (Main.appVersion.equals(newVersion.version())) {
252252
output[3] = "%nYou are on the latest version.";
253253
} else {
254-
output[3] = "%nNew Update Available: " + newVersion + ". Update using your package manager or at%n https://github.com/airsquared/blobsaver/releases";
254+
output[3] = STR."%nNew Update Available: \{newVersion}. Update using your package manager or at%n https://github.com/airsquared/blobsaver/releases";
255255
}
256256
} catch (Exception e) {
257257
output[3] = "%nUnable to check for updates.";
@@ -262,7 +262,7 @@ public String[] getVersion() {
262262
}
263263

264264
private static String success(String s) {
265-
return Help.Ansi.AUTO.string("@|bold,green " + s + "|@");
265+
return Help.Ansi.AUTO.string(STR."@|bold,green \{s}|@");
266266
}
267267

268268
private void checkArgs(String... names) {

0 commit comments

Comments
 (0)