X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/1c7d1861d6b004c47b5a3264fbfec071f25a9e7b..fab1b96c21ead48b64442f6d07beedef959de6ee:/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index bd257e5a..158778fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,14 +3,20 @@ plugins { application eclipse `check-lib-versions` - id("org.graalvm.buildtools.native") version "0.9.13" + id("org.graalvm.buildtools.native") version "0.10.3" } -version = "0.10.8" +version = "0.13.8-SNAPSHOT" 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 { @@ -20,25 +26,31 @@ application { 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")) - buildArgs.add("--report-unsupported-elements-at-runtime") + if (System.getenv("GRAALVM_HOME") == null) { + toolchainDetection.set(true) + javaLauncher.set(javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(21)) + }) + } else { + toolchainDetection.set(false) + } } } } -repositories { - mavenLocal() - mavenCentral() -} - dependencies { - implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") - implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.3") - implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0") - implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.1.0") - implementation("org.slf4j", "slf4j-api", "1.7.36") - implementation("ch.qos.logback", "logback-classic", "1.2.11") - implementation("org.slf4j", "jul-to-slf4j", "1.7.36") + implementation(libs.bouncycastle) + implementation(libs.jackson.databind) + implementation(libs.argparse4j) + implementation(libs.dbusjava) + implementation(libs.slf4j.api) + implementation(libs.slf4j.jul) + implementation(libs.logback) implementation(project(":lib")) } @@ -74,10 +86,12 @@ task("fatJar", type = Jar::class) { "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", - "META-INF/NOTICE", - "META-INF/LICENSE", + "META-INF/NOTICE*", + "META-INF/LICENSE*", + "META-INF/INDEX.LIST", "**/module-info.class" ) + duplicatesStrategy = DuplicatesStrategy.WARN from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) - with(tasks.jar.get() as CopySpec) + with(tasks.jar.get()) }