X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4adb11dada29ac6ca2d12270fd7e617007ff9bf3..fd8ccae22278dfa63a8ba247937c9a0fcfa3eafb:/build.gradle.kts?ds=sidebyside

diff --git a/build.gradle.kts b/build.gradle.kts
index b2bd53e4..99de4644 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,31 +2,45 @@ plugins {
     java
     application
     eclipse
+    `check-lib-versions`
+    id("org.graalvm.buildtools.native") version "0.9.10"
 }
 
-version = "0.7.4"
+version = "0.10.4.2"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 application {
     mainClass.set("org.asamk.signal.Main")
 }
 
+graalvmNative {
+    binaries {
+        this["main"].run {
+            configurationFileDirectories.from(file("graalvm-config-dir"))
+            buildArgs.add("--allow-incomplete-classpath")
+            buildArgs.add("--report-unsupported-elements-at-runtime")
+        }
+    }
+}
+
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
 dependencies {
-    implementation("com.google.protobuf:protobuf-javalite:3.10.0")
-    implementation("com.github.turasa:signal-service-java:2.15.3_unofficial_18")
-    implementation("org.bouncycastle:bcprov-jdk15on:1.68")
-    implementation("net.sourceforge.argparse4j:argparse4j:0.8.1")
-    implementation("com.github.hypfvieh:dbus-java:3.2.4")
-    implementation("org.slf4j:slf4j-simple:1.7.30")
+    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"))
 }
 
 configurations {
@@ -35,6 +49,12 @@ configurations {
     }
 }
 
+
+tasks.withType<AbstractArchiveTask>().configureEach {
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+}
+
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
@@ -42,88 +62,23 @@ tasks.withType<JavaCompile> {
 tasks.withType<Jar> {
     manifest {
         attributes(
-                "Implementation-Title" to project.name,
-                "Implementation-Version" to project.version,
-                "Main-Class" to application.mainClass.get()
+            "Implementation-Title" to project.name,
+            "Implementation-Version" to project.version,
+            "Main-Class" to application.mainClass.get()
         )
     }
 }
 
-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>
-    }
-}
-
-// Find any 3rd party libraries which have released new versions
-// to the central Maven repo since we last upgraded.
-val checkLibVersions by tasks.registering {
-    doLast {
-        val checked = kotlin.collections.HashSet<Dependency>()
-        allprojects {
-            configurations.forEach { configuration ->
-                configuration.allDependencies.forEach { dependency ->
-                    val version = dependency.version
-                    if (!checked.contains(dependency)) {
-                        val group = dependency.group
-                        val path = group?.replace(".", "/") ?: ""
-                        val name = dependency.name
-                        val metaDataUrl = "https://repo1.maven.org/maven2/$path/$name/maven-metadata.xml"
-                        try {
-                            val url = org.codehaus.groovy.runtime.ResourceGroovyMethods.toURL(metaDataUrl)
-                            val metaDataText = org.codehaus.groovy.runtime.ResourceGroovyMethods.getText(url)
-                            val metadata = groovy.util.XmlSlurper().parseText(metaDataText)
-                            val newest = (metadata.getProperty("versioning") as groovy.util.slurpersupport.GPathResult).getProperty("latest")
-                            if (version != newest.toString()) {
-                                println("UPGRADE {\"group\": \"$group\", \"name\": \"$name\", \"current\": \"$version\", \"latest\": \"$newest\"}")
-                            }
-                        } catch (e: Throwable) {
-                            logger.debug("Unable to download or parse $metaDataUrl: $e.message")
-                        }
-                        checked.add(dependency)
-                    }
-                }
-            }
-        }
-    }
-}
-
-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())
-        }
-    }
+task("fatJar", type = Jar::class) {
+    archiveBaseName.set("${project.name}-fat")
+    exclude(
+        "META-INF/*.SF",
+        "META-INF/*.DSA",
+        "META-INF/*.RSA",
+        "META-INF/NOTICE",
+        "META-INF/LICENSE",
+        "**/module-info.class"
+    )
+    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    with(tasks.jar.get() as CopySpec)
 }