Merge 0e9e11d44f7d09abd77c51cbced1e2b31ecf3a12 into 3c17e01c377a487581d169e0fa8f9e8a90e0c882

This commit is contained in:
dvrdnz 2026-08-21 21:40:05 +00:00 committed by GitHub
commit 9b4928a27b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 6 deletions

View File

@ -15,14 +15,25 @@ 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)
@ -60,4 +71,4 @@ tasks.jar {
manifest {
attributes("Automatic-Module-Name" to "org.asamk.signal.manager")
}
}
}

View File

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