diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index b5e7f315..55ac69ad 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -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) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java index 84a929e4..8e3f13ec 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java @@ -414,4 +414,4 @@ public class SessionStore implements SignalServiceSessionStore { } record Key(String address, int deviceId) {} -} +} \ No newline at end of file