Prepare next release

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

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

-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }

 }
 
 }
 

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

 dependencies {
 dependencies {

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

-    implementation(libs.protobuf)

     implementation(libs.bouncycastle)
     implementation(libs.slf4j.api)
     implementation(libs.sqlite)
     implementation(libs.hikari)
 
     implementation(libs.bouncycastle)
     implementation(libs.slf4j.api)
     implementation(libs.sqlite)
     implementation(libs.hikari)
 

-    testImplementation(libs.junit)
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.launcher)

 }
 
 tasks.named<Test>("test") {
 }
 
 tasks.named<Test>("test") {