X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/0da37d0c90d4b751fb1e41d2f2f2ff485ad5290a..54a08f560ebaf42cb06faef8b7d69aa406fd4854:/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index e54613b3..feba8e39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,10 @@ plugins { application eclipse `check-lib-versions` - id("org.graalvm.buildtools.native") version "0.9.9" + id("org.graalvm.buildtools.native") version "0.9.17" } -version = "0.10.0" +version = "0.11.5" java { sourceCompatibility = JavaVersion.VERSION_17 @@ -20,9 +20,15 @@ application { graalvmNative { binaries { this["main"].run { + resources.autodetect() configurationFileDirectories.from(file("graalvm-config-dir")) - buildArgs.add("--allow-incomplete-classpath") - buildArgs.add("--report-unsupported-elements-at-runtime") + if (System.getenv("GRAALVM_HOME") == null) { + javaLauncher.set(javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(17)) + }) + } else { + toolchainDetection.set(false) + } } } } @@ -30,18 +36,16 @@ graalvmNative { repositories { mavenLocal() mavenCentral() - maven { - url = uri("https://raw.github.com/AsamK/maven/master/releases/") - } } dependencies { implementation("org.bouncycastle", "bcprov-jdk15on", "1.70") - implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.0") + implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.0") implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0") - implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0-beta") - implementation("org.slf4j", "slf4j-simple", "1.7.32") - implementation("org.slf4j", "jul-to-slf4j", "1.7.32") + implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1") + implementation("org.slf4j", "slf4j-api", "2.0.3") + implementation("ch.qos.logback", "logback-classic", "1.4.4") + implementation("org.slf4j", "jul-to-slf4j", "2.0.3") implementation(project(":lib")) } @@ -77,10 +81,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()) }