Switch to Java 21

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

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 9b12a3289dd1b9859c5a5fdb4247962e941d9447..38d4c221170b2586e34fa69a46b352bf9e5266d0 100644 (file)
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -4,25 +4,32 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
+    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 {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_63")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2")
-    implementation("com.google.protobuf", "protobuf-javalite", "3.21.6")
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "2.0.3")
-    implementation("org.xerial", "sqlite-jdbc", "3.39.3.0")
-    implementation("com.zaxxer", "HikariCP", "5.0.1")
-
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.0")
+    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)
 }
 
 tasks.named<Test>("test") {