From 99971caba5c42560105973107315dea85196f96b Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 9 Aug 2024 15:38:20 +0000
Subject: [PATCH] Various fixes

---
 app/build.gradle                                         | 9 +++++----
 .../main/java/io/xpipe/core/process/ShellControl.java    | 4 ----
 .../main/java/io/xpipe/core/process/ShellDialect.java    | 4 +++-
 dist/licenses/commons-lang.properties                    | 2 +-
 dist/licenses/sentry.properties                          | 2 +-
 dist/licenses/slf4j.properties                           | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c13ffc15d..a3cf49751 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,8 +55,8 @@ dependencies {
     api ('org.kohsuke:github-api:1.323') {
         exclude group: 'org.apache.commons', module: 'commons-lang3'
     }
-    api 'org.apache.commons:commons-lang3:3.15.0'
-    api 'io.sentry:sentry:7.12.1'
+    api 'org.apache.commons:commons-lang3:3.16.0'
+    api 'io.sentry:sentry:7.13.0'
     api 'commons-io:commons-io:2.16.1'
     api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.17.2"
     api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.17.2"
@@ -65,8 +65,8 @@ dependencies {
     api group: 'org.kordamp.ikonli', name: 'ikonli-javafx', version: "12.2.0"
     api group: 'org.kordamp.ikonli', name: 'ikonli-material-pack', version: "12.2.0"
     api group: 'org.kordamp.ikonli', name: 'ikonli-feather-pack', version: "12.2.0"
-    api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
-    api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.13'
+    api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.15'
+    api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.15'
     api 'io.xpipe:modulefs:0.1.5'
     api 'net.synedra:validatorfx:0.4.2'
     api files("$rootDir/gradle/gradle_scripts/atlantafx-base-2.0.2.jar")
@@ -94,6 +94,7 @@ run {
     systemProperty 'io.xpipe.app.logLevel', "trace"
     systemProperty 'io.xpipe.app.fullVersion', rootProject.fullVersion
     systemProperty 'io.xpipe.app.staging', isStage
+    // systemProperty 'io.xpipe.beacon.port', "30000"
 
     // Apply passed xpipe properties
     for (final def e in System.getProperties().entrySet()) {
diff --git a/core/src/main/java/io/xpipe/core/process/ShellControl.java b/core/src/main/java/io/xpipe/core/process/ShellControl.java
index 8c274344c..f0cb5af7d 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellControl.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellControl.java
@@ -208,10 +208,6 @@ public interface ShellControl extends ProcessControl {
 
     ShellControl singularSubShell(ShellOpenFunction command);
 
-    void writeLineAndReadEcho(String command) throws Exception;
-
-    void writeLineAndReadEcho(String command, boolean log) throws Exception;
-
     void cd(String directory) throws Exception;
 
     default CommandControl command(String command) {
diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialect.java b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
index 8c19b108e..ff61b7b21 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellDialect.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellDialect.java
@@ -118,7 +118,9 @@ public interface ShellDialect {
 
     CommandControl printUsernameCommand(ShellControl shellControl);
 
-    String getPrintExitCodeCommand(String prefix, String suffix);
+    String getPrintStartEchoCommand(String prefix);
+
+    String getPrintExitCodeCommand(String id, String prefix, String suffix);
 
     int assignMissingExitCode();
 
diff --git a/dist/licenses/commons-lang.properties b/dist/licenses/commons-lang.properties
index af3142f0a..7c09cfa09 100644
--- a/dist/licenses/commons-lang.properties
+++ b/dist/licenses/commons-lang.properties
@@ -1,4 +1,4 @@
 name=Commons Lang
-version=3.15.0
+version=3.16.0
 license=Apache License 2.0
 link=https://commons.apache.org/proper/commons-lang/
\ No newline at end of file
diff --git a/dist/licenses/sentry.properties b/dist/licenses/sentry.properties
index 642b705ae..638c7b8a4 100644
--- a/dist/licenses/sentry.properties
+++ b/dist/licenses/sentry.properties
@@ -1,4 +1,4 @@
 name=Sentry Java
-version=7.6.0
+version=7.13.0
 license=MIT License
 link=https://github.com/getsentry/sentry-java
\ No newline at end of file
diff --git a/dist/licenses/slf4j.properties b/dist/licenses/slf4j.properties
index cecb18920..2dc87d2c4 100644
--- a/dist/licenses/slf4j.properties
+++ b/dist/licenses/slf4j.properties
@@ -1,4 +1,4 @@
 name=SLF4J
-version=2.0.13
+version=2.0.15
 license=MIT License
 link=https://www.slf4j.org/
\ No newline at end of file