Skip to content

Commit 66a2dd2

Browse files
committed
Dependency updates
1 parent 3422799 commit 66a2dd2

File tree

10 files changed

+35
-12
lines changed

10 files changed

+35
-12
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: daily
7-
time: "03:00"
8-
timezone: US/Pacific
9-
open-pull-requests-limit: 99
7+
- package-ecosystem: github-actions
8+
directory: "/"
9+
schedule:
10+
interval: daily

.idea/jsonSchemas.xml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
id 'application'
2424
id 'com.github.ben-manes.versions' version '0.46.0'
2525
id 'org.beryx.jlink' version '2.26.0'
26-
id 'org.openjfx.javafxplugin' version '0.0.13'
26+
id 'org.openjfx.javafxplugin' version '0.0.14'
2727

2828
id 'idea'
2929
}
@@ -53,9 +53,9 @@ dependencies {
5353
}
5454
implementation 'net.java.dev.jna:jna-jpms:5.13.0'
5555
implementation 'org.apache.commons:commons-compress:1.23.0'
56-
implementation 'info.picocli:picocli:4.7.2'
56+
implementation 'info.picocli:picocli:4.7.4'
5757

58-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
58+
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
5959
testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
6060
}
6161

Lines changed: 1 addition & 1 deletion
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.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static void sendRequest(String url) {
104104
try {
105105
Network.makeVoidRequest(url);
106106
} catch (Throwable e) { // don't interrupt application if error occurs
107-
e.printStackTrace();
107+
System.err.println(e);
108108
}
109109
}
110110

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ private static void macosBackgroundFile() {
7575
try {
7676
Files.createDirectories(Path.of(System.getProperty("user.home"), "Library/LaunchAgents"));
7777
Files.writeString(plistFilePath, plist);
78+
System.out.println("Wrote to: " + plistFilePath);
7879
} catch (IOException e) {
7980
throw new UncheckedIOException(e);
8081
}
@@ -103,6 +104,7 @@ private static void linuxBackgroundFile() {
103104
Files.createDirectories(systemdDir);
104105
Files.writeString(systemdDir.resolve("blobsaver.service"), service);
105106
Files.writeString(systemdDir.resolve("blobsaver.timer"), timer);
107+
System.out.println("Wrote to: " + systemdDir);
106108
} catch (IOException e) {
107109
throw new UncheckedIOException(e);
108110
}
@@ -173,6 +175,7 @@ private static Path windowsBackgroundFile() {
173175
try {
174176
Path path = Files.createTempFile("blobsaver_background_service", ".xml");
175177
Files.writeString(path, xml);
178+
System.out.println("Wrote to: " + path);
176179
return path;
177180
} catch (IOException e) {
178181
throw new UncheckedIOException(e);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public String[] getVersion() {
244244
"%nHomepage: https://github.com/airsquared/blobsaver"};
245245
try {
246246
var newVersion = Utils.LatestVersion.request();
247-
if (Main.appVersion.equals(newVersion.toString())) {
247+
if (Main.appVersion.equals(newVersion.version())) {
248248
output[3] = "%nYou are on the latest version.";
249249
} else {
250250
output[3] = "%nNew Update Available: " + newVersion + ". Update using your package manager or at%n https://github.com/airsquared/blobsaver/releases";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private static void loadProperties() throws IOException {
177177
private Consumer<String> keyProcessor;
178178

179179
void load(String resourceName, Consumer<String> keyProcessor) throws IOException {
180-
this.keyProcessor = keyProcessor;
180+
this.keyProcessor = keyProcessor; // not thread safe
181181
try (var stream = Devices.class.getResourceAsStream(resourceName)) {
182182
load(stream);
183183
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private static void _checkForUpdates(boolean forceCheck) {
113113
throw new UncheckedIOException(e);
114114
}
115115

116-
if (!Main.appVersion.equals(newVersion.toString()) && (forceCheck || !Prefs.shouldIgnoreVersion(newVersion.toString()))) {
116+
if (!Main.appVersion.equals(newVersion.version()) && (forceCheck || !Prefs.shouldIgnoreVersion(newVersion.version()))) {
117117
runLater(() -> {
118118
ButtonType downloadNow = new ButtonType("Download");
119119
ButtonType ignore = new ButtonType("Ignore this update");
@@ -128,7 +128,7 @@ private static void _checkForUpdates(boolean forceCheck) {
128128
if (alert.getResult().equals(downloadNow)) {
129129
openURL("https://github.com/airsquared/blobsaver/releases");
130130
} else if (alert.getResult().equals(ignore)) {
131-
Prefs.setIgnoreVersion(newVersion.toString());
131+
Prefs.setIgnoreVersion(newVersion.version());
132132
}
133133
});
134134
} else if (forceCheck) {

0 commit comments

Comments
 (0)