Add handling for new nickname and note fields

[signal-cli] / lib / build.gradle.kts

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 57c80c01d0845ecc66f068fee1745863eddfa526..c8f22f7cee98cebcccb7174345579ce726f21d29 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -4,20 +4,37 @@ plugins {
 }
 
 java {
 }
 
 java {

-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21

 
 

-repositories {
-    mavenLocal()
-    mavenCentral()
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }

 }
 
 }
 

+val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
+

 dependencies {
 dependencies {

-    api("com.github.turasa:signal-service-java:2.15.3_unofficial_30")
-    implementation("com.google.protobuf:protobuf-javalite:3.10.0")
-    implementation("org.bouncycastle:bcprov-jdk15on:1.69")
-    implementation("org.slf4j:slf4j-api:1.7.30")
+    if (libsignalClientPath == null) {
+        implementation(libs.signalservice)
+    } else {
+        implementation(libs.signalservice) {
+            exclude(group = "org.signal", module = "libsignal-client")
+        }
+        implementation(files(libsignalClientPath))
+    }
+    implementation(libs.jackson.databind)
+    implementation(libs.bouncycastle)
+    implementation(libs.slf4j.api)
+    implementation(libs.sqlite)
+    implementation(libs.hikari)
+
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.launcher)
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()

 }
 
 configurations {
 }
 
 configurations {


@@ -34,3 +51,9 @@ tasks.withType<AbstractArchiveTask>().configureEach {
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }

+
+tasks.jar {
+    manifest {
+        attributes("Automatic-Module-Name" to "org.asamk.signal.manager")
+    }
+}