From ca87be47336f1ab1a59ed1c14519612318aa811e Mon Sep 17 00:00:00 2001 From: Rob Greene Date: Sun, 29 Oct 2023 13:55:46 -0500 Subject: [PATCH] Updating version of Picocli. --- tools/bt/build.gradle | 2 +- .../java/io/github/applecommander/bastools/tools/bt/Main.java | 3 ++- tools/st/build.gradle | 2 +- .../java/io/github/applecommander/bastools/tools/st/Main.java | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/bt/build.gradle b/tools/bt/build.gradle index 07deeea..e4f844a 100644 --- a/tools/bt/build.gradle +++ b/tools/bt/build.gradle @@ -20,7 +20,7 @@ bootJar { } dependencies { - implementation 'info.picocli:picocli:3.0.2' + implementation 'info.picocli:picocli:4.7.5' implementation 'net.sf.applecommander:applesingle-api:1.2.2' implementation project(':bastools-api') } diff --git a/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java index d9c8650..49828b4 100644 --- a/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java +++ b/tools/bt/src/main/java/io/github/applecommander/bastools/tools/bt/Main.java @@ -103,7 +103,8 @@ public class Main implements Callable { public static void main(String[] args) throws FileNotFoundException, IOException { try { - CommandLine.call(new Main(), args); + int exitCode = new CommandLine(new Main()).execute(args); + System.exit(exitCode); } catch (Throwable t) { if (Main.debugFlag) { t.printStackTrace(System.err); diff --git a/tools/st/build.gradle b/tools/st/build.gradle index 937ef74..b3a1359 100644 --- a/tools/st/build.gradle +++ b/tools/st/build.gradle @@ -20,7 +20,7 @@ bootJar { } dependencies { - implementation 'info.picocli:picocli:3.0.2' + implementation 'info.picocli:picocli:4.7.5' implementation 'net.sf.applecommander:applesingle-api:1.2.2' implementation 'net.sf.applecommander:AppleCommander:1.8.0' implementation project(':bastools-api') diff --git a/tools/st/src/main/java/io/github/applecommander/bastools/tools/st/Main.java b/tools/st/src/main/java/io/github/applecommander/bastools/tools/st/Main.java index 2ceb7a1..ffbe559 100644 --- a/tools/st/src/main/java/io/github/applecommander/bastools/tools/st/Main.java +++ b/tools/st/src/main/java/io/github/applecommander/bastools/tools/st/Main.java @@ -26,7 +26,8 @@ public class Main implements Runnable { public static void main(String[] args) { try { - CommandLine.run(new Main(), args); + int exitCode = new CommandLine(new Main()).execute(args); + System.exit(exitCode); } catch (Throwable t) { if (Main.debugFlag) { t.printStackTrace(System.err);