Exclude libsignal-client testing libraries

[signal-cli] / build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 77e6971a0c1cf52d6561f1dd54bd6169a1bb65d8..67a180fb0df5b83b0e16ab56864a3936de29f484 100644 (file)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,14 +3,23 @@ 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.5"

 }
 
 }
 

-version = "0.11.6"
+allprojects {
+    group = "org.asamk"
+    version = "0.13.14-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 +29,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)


@@ -33,7 +46,41 @@ graalvmNative {
     }
 }
 
     }
 }
 

+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 {

+    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.bouncycastle)
     implementation(libs.jackson.databind)
     implementation(libs.argparse4j)


@@ -41,7 +88,7 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.slf4j.jul)
     implementation(libs.logback)
     implementation(libs.slf4j.api)
     implementation(libs.slf4j.jul)
     implementation(libs.logback)

-    implementation(project(":lib"))
+    implementation(project(":libsignal-cli"))

 }
 
 configurations {
 }
 
 configurations {


@@ -70,7 +117,7 @@ tasks.withType<Jar> {
     }
 }
 
     }
 }
 

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

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


@@ -79,9 +126,11 @@ task("fatJar", type = Jar::class) {
         "META-INF/NOTICE*",
         "META-INF/LICENSE*",
         "META-INF/INDEX.LIST",
         "META-INF/NOTICE*",
         "META-INF/LICENSE*",
         "META-INF/INDEX.LIST",

-        "**/module-info.class"
+        "**/module-info.class",

     )
     duplicatesStrategy = DuplicatesStrategy.WARN
     )
     duplicatesStrategy = DuplicatesStrategy.WARN

-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    doFirst {
+        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    }

     with(tasks.jar.get())
 }
     with(tasks.jar.get())
 }