From 5d6c8b95bcbca40cf83aba6984254d7d27821a93 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 2 May 2024 23:18:41 +0000 Subject: [PATCH] Fix property characters --- app/build.gradle | 1 - app/src/main/java/io/xpipe/app/core/AppProperties.java | 2 +- build.gradle | 2 +- dist/debug/linux/debug_attach_arguments.txt | 3 ++- dist/debug/mac/debug_attach_arguments.txt | 3 ++- dist/debug/windows/debug_attach_arguments.txt | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9a7b3dc82..3d07a6484 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,7 +75,6 @@ application { mainModule = 'io.xpipe.app' mainClass = 'io.xpipe.app.Main' applicationDefaultJvmArgs = jvmRunArgs - applicationDefaultJvmArgs.add('-XX:+EnableDynamicAgentLoading') } run { diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 0d69d5342..c85755a87 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -55,7 +55,7 @@ public class AppProperties { .orElse(UUID.randomUUID()); sentryUrl = System.getProperty("io.xpipe.app.sentryUrl"); arch = System.getProperty("io.xpipe.app.arch"); - languages = Arrays.stream(System.getProperty("io.xpipe.app.languages").split(";")) + languages = Arrays.stream(System.getProperty("io.xpipe.app.languages").split(",")) .sorted() .toList(); staging = XPipeInstallation.isStaging(); diff --git a/build.gradle b/build.gradle index 8fe2edd6c..c5aa3a2d0 100644 --- a/build.gradle +++ b/build.gradle @@ -117,7 +117,7 @@ project.ext { "--add-opens", "javafx.graphics/com.sun.javafx.tk.quantum=io.xpipe.app", "-Xmx8g", "-Dio.xpipe.app.arch=$rootProject.arch", - "-Dio.xpipe.app.languages=${String.join(";", languages)}", + "-Dio.xpipe.app.languages=${String.join(",", languages)}", "-Dfile.encoding=UTF-8", // Disable this for now as it requires Windows 10+ // '-XX:+UseZGC', diff --git a/dist/debug/linux/debug_attach_arguments.txt b/dist/debug/linux/debug_attach_arguments.txt index 405f4bd85..ae7f6dc3d 100644 --- a/dist/debug/linux/debug_attach_arguments.txt +++ b/dist/debug/linux/debug_attach_arguments.txt @@ -1,2 +1,3 @@ -javaagent:$HOME/.attachme/attachme-agent-1.2.4.jar=port:7857,host:localhost --agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 \ No newline at end of file +-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 +-XX:+EnableDynamicAgentLoading \ No newline at end of file diff --git a/dist/debug/mac/debug_attach_arguments.txt b/dist/debug/mac/debug_attach_arguments.txt index 405f4bd85..ae7f6dc3d 100644 --- a/dist/debug/mac/debug_attach_arguments.txt +++ b/dist/debug/mac/debug_attach_arguments.txt @@ -1,2 +1,3 @@ -javaagent:$HOME/.attachme/attachme-agent-1.2.4.jar=port:7857,host:localhost --agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 \ No newline at end of file +-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 +-XX:+EnableDynamicAgentLoading \ No newline at end of file diff --git a/dist/debug/windows/debug_attach_arguments.txt b/dist/debug/windows/debug_attach_arguments.txt index 572fc18d5..fd06132a5 100644 --- a/dist/debug/windows/debug_attach_arguments.txt +++ b/dist/debug/windows/debug_attach_arguments.txt @@ -1,2 +1,3 @@ -javaagent:%userprofile%\\.attachme\\attachme-agent-1.2.4.jar=port:7857,host:localhost --agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 \ No newline at end of file +-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:0 +-XX:+EnableDynamicAgentLoading \ No newline at end of file