Don't set previousE164s param if cdsi token is empty

[signal-cli] / build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 77e6971a0c1cf52d6561f1dd54bd6169a1bb65d8..983e128b54bdddd190896724d5481a1a7be16344 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,14 +3,20 @@ plugins {
     application
     eclipse
     `check-lib-versions`
     application
     eclipse
     `check-lib-versions`

-    id("org.graalvm.buildtools.native") version "0.9.20"
+    id("org.graalvm.buildtools.native") version "0.10.2"

 }
 
 }
 

-version = "0.11.6"
+version = "0.13.6-SNAPSHOT"

 
 java {
 
 java {

-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    if (!JavaVersion.current().isCompatibleWith(targetCompatibility)) {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(targetCompatibility.majorVersion))
+        }
+    }

 }
 
 application {
 }
 
 application {


@@ -20,11 +26,15 @@ application {
 graalvmNative {
     binaries {
         this["main"].run {
 graalvmNative {
     binaries {
         this["main"].run {

+            buildArgs.add("--install-exit-handlers")
+            buildArgs.add("-Dfile.encoding=UTF-8")
+            buildArgs.add("-J-Dfile.encoding=UTF-8")

             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {

+                toolchainDetection.set(true)

                 javaLauncher.set(javaToolchains.launcherFor {
                 javaLauncher.set(javaToolchains.launcherFor {

-                    languageVersion.set(JavaLanguageVersion.of(17))
+                    languageVersion.set(JavaLanguageVersion.of(21))

                 })
             } else {
                 toolchainDetection.set(false)
                 })
             } else {
                 toolchainDetection.set(false)