Merge bed875ad0b032121cb6fb3a0166e61fbd04207ee into 3c17e01c377a487581d169e0fa8f9e8a90e0c882

This commit is contained in:
dvrdnz 2026-08-21 23:39:46 +02:00 committed by GitHub
commit 5dbfe7eed0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 5 deletions

View File

@ -15,20 +15,36 @@ java {
}
val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
val libsignalClientVersion = "0.101.0"
val androidClassifier = project.findProperty("androidClassifier")?.toString()
dependencies {
implementation(libs.signalnetwork) {
exclude(group = "org.signal", module = "libsignal-client")
}
if (libsignalClientPath == null) {
implementation(libs.signalnetwork)
} else {
implementation(libs.signalnetwork) {
exclude(group = "org.signal", module = "libsignal-client")
implementation("org.signal:libsignal-client:$libsignalClientVersion")
if (androidClassifier != null) {
implementation(
group = "org.signal",
name = "libsignal-client",
version = libsignalClientVersion,
classifier = androidClassifier,
)
}
} else {
implementation(files(libsignalClientPath))
}
implementation(libs.jackson.databind)
implementation(libs.bouncycastle)
implementation(libs.slf4j.api)
implementation(libs.sqlite)
if (androidClassifier != null) {
runtimeOnly(variantOf(libs.sqlite) {
classifier("natives-android")
})
}
implementation(libs.hikari)
compileOnly(libs.kotlinx.coroutines.core)

View File

@ -414,4 +414,4 @@ public class SessionStore implements SignalServiceSessionStore {
}
record Key(String address, int deviceId) {}
}
}