Merge bed875ad0b032121cb6fb3a0166e61fbd04207ee into 3c17e01c377a487581d169e0fa8f9e8a90e0c882

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)
+        implementation("org.signal:libsignal-client:$libsignalClientVersion")
-    } else {
+        if (androidClassifier != null) {
-        implementation(libs.signalnetwork) {
+            implementation(
-            exclude(group = "org.signal", module = "libsignal-client")
+                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)
 

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) {}
-}
+}