Ensure messages are created with a unique timestamp

[signal-cli] / build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index fa87a606e41796b7cfddfaf700f1556cbc91458f..267673d6fc3f120860dcd68aa1b054ddbc38b546 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,44 +3,94 @@ plugins {
     application
     eclipse
     `check-lib-versions`
     application
     eclipse
     `check-lib-versions`

-    id("org.graalvm.buildtools.native") version "0.9.9"
+    id("org.graalvm.buildtools.native") version "0.10.6"

 }
 
 }
 

-version = "0.10.2"
+allprojects {
+    group = "org.asamk"
+    version = "0.13.16-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 {
     mainClass.set("org.asamk.signal.Main")
 }
 
 application {
     mainClass.set("org.asamk.signal.Main")

+    applicationDefaultJvmArgs = listOf("--enable-native-access=ALL-UNNAMED")

 }
 
 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")
+            buildArgs.add("-march=compatibility")
+            resources.autodetect()

             configurationFileDirectories.from(file("graalvm-config-dir"))
             configurationFileDirectories.from(file("graalvm-config-dir"))

-            buildArgs.add("--allow-incomplete-classpath")
-            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()
+val artifactType = Attribute.of("artifactType", String::class.java)
+val minified = Attribute.of("minified", Boolean::class.javaObjectType)
+dependencies {
+    attributesSchema {
+        attribute(minified)
+    }
+    artifactTypes.getByName("jar") {
+        attributes.attribute(minified, false)
+    }
+}
+
+configurations.runtimeClasspath.configure {
+    attributes {
+        attribute(minified, true)
+    }

 }
 }

+val excludePatterns = mapOf(
+    "libsignal-client" to setOf(
+        "libsignal_jni_testing_amd64.so",
+        "signal_jni_testing_amd64.dll",
+        "libsignal_jni_testing_amd64.dylib",
+        "libsignal_jni_testing_aarch64.dylib",
+    )
+)

 
 dependencies {
 
 dependencies {

-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.1")
-    implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
-    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.0.0")
-    implementation("org.slf4j", "slf4j-api", "1.7.32")
-    implementation("ch.qos.logback", "logback-classic", "1.2.10")
-    implementation("org.slf4j", "jul-to-slf4j", "1.7.32")
-    implementation(project(":lib"))
+    registerTransform(JarFileExcluder::class) {
+        from.attribute(minified, false).attribute(artifactType, "jar")
+        to.attribute(minified, true).attribute(artifactType, "jar")
+
+        parameters {
+            excludeFilesByArtifact = excludePatterns
+        }
+    }
+
+    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(":libsignal-cli"))

 }
 
 configurations {
 }
 
 configurations {


@@ -64,21 +114,26 @@ tasks.withType<Jar> {
         attributes(
             "Implementation-Title" to project.name,
             "Implementation-Version" to project.version,
         attributes(
             "Implementation-Title" to project.name,
             "Implementation-Version" to project.version,

-            "Main-Class" to application.mainClass.get()
+            "Main-Class" to application.mainClass.get(),
+            "Enable-Native-Access" to "ALL-UNNAMED",

         )
     }
 }
 
         )
     }
 }
 

-task("fatJar", type = Jar::class) {
+tasks.register("fatJar", type = Jar::class) {

     archiveBaseName.set("${project.name}-fat")
     exclude(
         "META-INF/*.SF",
         "META-INF/*.DSA",
         "META-INF/*.RSA",
     archiveBaseName.set("${project.name}-fat")
     exclude(
         "META-INF/*.SF",
         "META-INF/*.DSA",
         "META-INF/*.RSA",

-        "META-INF/NOTICE",
-        "META-INF/LICENSE",
-        "**/module-info.class"
+        "META-INF/NOTICE*",
+        "META-INF/LICENSE*",
+        "META-INF/INDEX.LIST",
+        "**/module-info.class",

     )
     )

-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
+    duplicatesStrategy = DuplicatesStrategy.WARN
+    doFirst {
+        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    }
+    with(tasks.jar.get())

 }
 }