Update dependencies (1.5.4)

e3ndr · Sep 20, 2024 · 4cabf41 · 4cabf41
1 parent 42fb26c
commit 4cabf41
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>xyz.e3ndr</groupId>
 	<artifactId>ConsoleUtil</artifactId>
-	<version>1.5.3</version>
+	<version>1.5.4</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -73,6 +73,10 @@
 	</build>
 
 	<repositories>
+		<repository>
+			<id>casterlabs-maven</id>
+			<url>https://repo.casterlabs.co/maven</url>
+		</repository>
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
@@ -102,22 +106,21 @@
 		</dependency>
 
 		<dependency>
-			<groupId>co.casterlabs.Commons</groupId>
-			<artifactId>Platform</artifactId>
-			<version>1.4.1</version>
+			<groupId>co.casterlabs.commons</groupId>
+			<artifactId>platform</artifactId>
+			<version>1.8.0-1</version>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>co.casterlabs.Rakurai</groupId>
-			<artifactId>Json</artifactId>
-			<version>1.17.7</version>
-			<scope>provided</scope>
+			<groupId>co.casterlabs.commons</groupId>
+			<artifactId>io</artifactId>
+			<version>1.8.0-1</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>co.casterlabs.Rakurai</groupId>
-			<artifactId>Util</artifactId>
-			<version>1.17.7</version>
+			<groupId>co.casterlabs</groupId>
+			<artifactId>rson</artifactId>
+			<version>1.18.0</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/xyz/e3ndr/consoleutil/platform/UnixPlatformHandler.java b/src/main/java/xyz/e3ndr/consoleutil/platform/UnixPlatformHandler.java
@@ -2,8 +2,9 @@
 
 import java.awt.Dimension;
 import java.io.IOException;
+import java.nio.charset.Charset;
 
-import co.casterlabs.rakurai.io.IOUtil;
+import co.casterlabs.commons.io.streams.StreamUtil;
 import lombok.NonNull;
 
 public class UnixPlatformHandler implements PlatformHandler {
@@ -45,10 +46,11 @@ public static boolean isGnome() {
 
     @Override
     public Dimension getSize() throws IOException, InterruptedException {
-        String[] sizeResult = IOUtil.readString(
+        String[] sizeResult = StreamUtil.toString(
             new ProcessBuilder("stty", "size")
                 .start()
-                .getInputStream()
+                .getInputStream(),
+            Charset.defaultCharset()
         )
             .trim()
             .split(" ");

diff --git a/src/main/java/xyz/e3ndr/consoleutil/platform/WindowsPlatformHandler.java b/src/main/java/xyz/e3ndr/consoleutil/platform/WindowsPlatformHandler.java
@@ -3,10 +3,11 @@
 import java.awt.Dimension;
 import java.io.IOException;
 import java.lang.ProcessBuilder.Redirect;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-import co.casterlabs.rakurai.io.IOUtil;
+import co.casterlabs.commons.io.streams.StreamUtil;
 import lombok.NonNull;
 
 public class WindowsPlatformHandler implements PlatformHandler {
@@ -15,7 +16,7 @@ public class WindowsPlatformHandler implements PlatformHandler {
 
     static {
         try {
-            String script = IOUtil.readString(WindowsPlatformHandler.class.getResourceAsStream("/consoleutil/windows/setup.ps1"));
+            String script = StreamUtil.toString(WindowsPlatformHandler.class.getResourceAsStream("/consoleutil/windows/setup.ps1"), Charset.defaultCharset());
             script = String.format("& {\n%s\n}", script);
 
             setupScriptEncoded = encodeScript(script);
@@ -24,7 +25,7 @@ public class WindowsPlatformHandler implements PlatformHandler {
         }
 
         try {
-            String script = IOUtil.readString(WindowsPlatformHandler.class.getResourceAsStream("/consoleutil/windows/size.ps1"));
+            String script = StreamUtil.toString(WindowsPlatformHandler.class.getResourceAsStream("/consoleutil/windows/size.ps1"), Charset.defaultCharset());
             script = String.format("& {\n%s\n}", script);
 
             sizeScriptEncoded = encodeScript(script);
@@ -72,7 +73,7 @@ public Dimension getSize() throws IOException, InterruptedException {
         Process process = powershell(sizeScriptEncoded);
         process.waitFor();
 
-        String result = IOUtil.readString(process.getInputStream()).trim();
+        String result = StreamUtil.toString(process.getInputStream(), Charset.defaultCharset()).trim();
         String[] sizes = result.split(",");
 
         int width = 0;