Update graalvm buildtools

[signal-cli] / build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 6826677f1a681aaf22c1de01f29d32d42cad962a..5d18e9e0ee46c700b9252b1eae8b0e663cea851a 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,9 +3,10 @@ plugins {
     application
     eclipse
     `check-lib-versions`
+    id("org.graalvm.buildtools.native") version "0.9.6"
 }
 
-version = "0.8.4.1"
+version = "0.9.0"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11
@@ -16,13 +17,22 @@ application {
     mainClass.set("org.asamk.signal.Main")
 }
 
+graalvmNative {
+    binaries {
+        this["main"].run {
+            configurationFileDirectories.from(file("graalvm-config-dir"))
+            buildArgs.add("--allow-incomplete-classpath")
+        }
+    }
+}
+
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
 dependencies {
-    implementation("org.bouncycastle:bcprov-jdk15on:1.68")
+    implementation("org.bouncycastle:bcprov-jdk15on:1.69")
     implementation("net.sourceforge.argparse4j:argparse4j:0.9.0")
     implementation("com.github.hypfvieh:dbus-java:3.3.0")
     implementation("org.slf4j:slf4j-simple:1.7.30")
@@ -54,51 +64,3 @@ tasks.withType<Jar> {
         )
     }
 }
-
-tasks.withType<JavaExec> {
-    val appArgs: String? by project
-    if (appArgs != null) {
-        // allow passing command-line arguments to the main application e.g.:
-        // $ gradle run -PappArgs="['-u', '+...', 'daemon', '--json']"
-        args = groovy.util.Eval.me(appArgs) as MutableList<String>
-    }
-}
-
-val assembleNativeImage by tasks.registering {
-    dependsOn("assemble")
-
-    var graalVMHome = ""
-    doFirst {
-        graalVMHome = System.getenv("GRAALVM_HOME")
-            ?: throw GradleException("Required GRAALVM_HOME environment variable not set.")
-    }
-
-    doLast {
-        val nativeBinaryOutputPath = "$buildDir/native-image"
-        val nativeBinaryName = "signal-cli"
-
-        mkdir(nativeBinaryOutputPath)
-
-        exec {
-            workingDir = File(".")
-            commandLine(
-                "$graalVMHome/bin/native-image",
-                "-H:Path=$nativeBinaryOutputPath",
-                "-H:Name=$nativeBinaryName",
-                "-H:JNIConfigurationFiles=graalvm-config-dir/jni-config.json",
-                "-H:DynamicProxyConfigurationFiles=graalvm-config-dir/proxy-config.json",
-                "-H:ResourceConfigurationFiles=graalvm-config-dir/resource-config.json",
-                "-H:ReflectionConfigurationFiles=graalvm-config-dir/reflect-config.json",
-                "--no-fallback",
-                "--allow-incomplete-classpath",
-                "--report-unsupported-elements-at-runtime",
-                "--enable-url-protocols=http,https",
-                "--enable-https",
-                "--enable-all-security-services",
-                "-cp",
-                sourceSets.main.get().runtimeClasspath.asPath,
-                application.mainClass.get()
-            )
-        }
-    }
-}