diff --git a/benchmark/build.gradle b/benchmark/build.gradle index f3db8b6..78965f6 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -16,11 +16,8 @@ dependencies { implementation project(':') } -application { +nativeImage { mainClass = 'net.woggioni.jwo.benchmark.Main' -} - -tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) { useMusl = true buildStaticImage = true -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index b60471b..6bdcb7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,6 @@ org.gradle.parallel=true org.gradle.caching=true gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven -jwo.version = 2025.01.26 -lys.version = 2025.01.24 +jwo.version = 2025.02.25 +lys.version = 2025.02.25 guice.version = 5.0.1 diff --git a/jmath-benchmark/build.gradle b/jmath-benchmark/build.gradle index 6dd8386..91e6a4a 100644 --- a/jmath-benchmark/build.gradle +++ b/jmath-benchmark/build.gradle @@ -16,15 +16,13 @@ dependencies { implementation project(':jmath') } -application { +nativeImage { mainClass = 'net.woggioni.jmath.benchmark.Main' + useMusl = true + buildStaticImage = true } configureNativeImage { args('20') } -tasks.named(NativeImagePlugin.NATIVE_IMAGE_TASK_NAME, NativeImageTask) { - useMusl = true - buildStaticImage = true -} \ No newline at end of file diff --git a/src/main/java/net/woggioni/jwo/Application.java b/src/main/java/net/woggioni/jwo/Application.java index c0ef7f3..fc6b692 100644 --- a/src/main/java/net/woggioni/jwo/Application.java +++ b/src/main/java/net/woggioni/jwo/Application.java @@ -73,7 +73,7 @@ public class Application { public Path computeCacheDirectory() { Stream commonCandidates = optional2Stream( Optional.ofNullable(cacheDirectoryPropertyKey).map(System::getProperty).map(Paths::get), - Optional.ofNullable(cacheDirectoryEnvVar).map(System::getProperty).map(Paths::get) + Optional.ofNullable(cacheDirectoryEnvVar).map(System::getenv).map(Paths::get) ); Stream osSpecificCandidates; if (OS.isMac) { @@ -108,7 +108,7 @@ public class Application { public Path computeDataDirectory() { Stream commonCandidates = optional2Stream( Optional.ofNullable(dataDirectoryPropertyKey).map(System::getProperty).map(Paths::get), - Optional.ofNullable(dataDirectoryEnvVar).map(System::getProperty).map(Paths::get) + Optional.ofNullable(dataDirectoryEnvVar).map(System::getenv).map(Paths::get) ); Stream osSpecificCandidates; if (OS.isMac) { @@ -143,7 +143,7 @@ public class Application { public Path computeConfigurationDirectory() { Stream commonCandidates = optional2Stream( Optional.ofNullable(configurationDirectoryPropertyKey).map(System::getProperty).map(Paths::get), - Optional.ofNullable(configurationDirectoryEnvVar).map(System::getProperty).map(Paths::get) + Optional.ofNullable(configurationDirectoryEnvVar).map(System::getenv).map(Paths::get) ); Stream osSpecificCandidates; if (OS.isMac) {