From 7b169a33b333199bd19d3812ba0f924651f09686 Mon Sep 17 00:00:00 2001 From: Christopher Schnick Date: Tue, 11 Oct 2022 18:09:11 +0200 Subject: [PATCH] Release 0.0.2.0 --- .../java/io/xpipe/beacon/BeaconConnection.java | 2 +- .../java/io/xpipe/beacon/BeaconServer.java | 18 +++++++++--------- deps | 2 +- .../io/xpipe/extension/util/Validator.java | 1 - misc/changelogs/0.0.2.0.txt | 1 + misc/version | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 misc/changelogs/0.0.2.0.txt diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java b/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java index 2222946f5..b6b720e11 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconConnection.java @@ -181,7 +181,7 @@ public abstract class BeaconConnection implements AutoCloseable { private BeaconException unwrapException(Exception exception) { if (exception instanceof ServerException s) { - return new BeaconException("And internal server error occurred", s.getCause()); + return new BeaconException("An internal server error occurred", s.getCause()); } if (exception instanceof ClientException s) { diff --git a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java index fbba038b2..a7ad6e4a4 100644 --- a/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java +++ b/beacon/src/main/java/io/xpipe/beacon/BeaconServer.java @@ -37,7 +37,7 @@ public class BeaconServer { var command = custom + " " + (BeaconConfig.getDaemonArguments() != null ? BeaconConfig.getDaemonArguments() : ""); - Process process = Runtime.getRuntime().exec(command); + Process process = Runtime.getRuntime().exec(command); printDaemonOutput(process, command); return process; } @@ -51,7 +51,7 @@ public class BeaconServer { BeaconConfig.getDaemonArguments() : ""); // Tell daemon that we launched from an external tool - Process process = Runtime.getRuntime().exec(command); + Process process = Runtime.getRuntime().exec(command); printDaemonOutput(process, command); return process; } @@ -65,17 +65,15 @@ public class BeaconServer { System.out.println("Starting daemon: " + command); } - if (!print) { - return; - } - new Thread(null, () -> { try { InputStreamReader isr = new InputStreamReader(proc.getInputStream()); BufferedReader br = new BufferedReader(isr); String line; while ((line = br.readLine()) != null) { - System.out.println("[xpiped] " + line); + if (print) { + System.out.println("[xpiped] " + line); + } } } catch (Exception ioe) { ioe.printStackTrace(); @@ -88,7 +86,9 @@ public class BeaconServer { BufferedReader br = new BufferedReader(isr); String line; while ((line = br.readLine()) != null) { - System.err.println("[xpiped] " + line); + if (print) { + System.err.println("[xpiped] " + line); + } } } catch (Exception ioe) { ioe.printStackTrace(); @@ -132,7 +132,7 @@ public class BeaconServer { Path executable = null; if (!debug) { if (System.getProperty("os.name").startsWith("Windows")) { - executable = Path.of("app", "xpiped.exe"); + executable = Path.of("app", "runtime", "bin", "xpiped.bat"); } else { executable = Path.of("app/bin/xpiped"); } diff --git a/deps b/deps index 5ec6b963c..2fe3d4995 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit 5ec6b963c1fd0b435dddc28b76caed019d7b9c25 +Subproject commit 2fe3d49953de977f50540e677f61b2463b1e8b82 diff --git a/extension/src/main/java/io/xpipe/extension/util/Validator.java b/extension/src/main/java/io/xpipe/extension/util/Validator.java index 968205a3d..4199a31a0 100644 --- a/extension/src/main/java/io/xpipe/extension/util/Validator.java +++ b/extension/src/main/java/io/xpipe/extension/util/Validator.java @@ -49,7 +49,6 @@ public interface Validator { /** Create a string property that depends on the validation result. * @param prefix The string to prefix each validation message with * @param separator The string to separate consecutive validation messages with - * @param severities The severities to consider; If none is given, only Severity.ERROR will be considered * @return */ public StringBinding createStringBinding(String prefix, String separator); diff --git a/misc/changelogs/0.0.2.0.txt b/misc/changelogs/0.0.2.0.txt new file mode 100644 index 000000000..ce9796c48 --- /dev/null +++ b/misc/changelogs/0.0.2.0.txt @@ -0,0 +1 @@ +Many fixes to get the API into a stable state. \ No newline at end of file diff --git a/misc/version b/misc/version index dc6168404..86d494649 100644 --- a/misc/version +++ b/misc/version @@ -1 +1 @@ -0.0.1.6-SNAPSHOT \ No newline at end of file +0.0.2.0 \ No newline at end of file