Move wp_api/cache to new wp_mobile_cache crate

Author: oguzkocer

Cargo.lock

@@ -13,6 +13,7 @@ members = [
   "wp_localization_parser",
   "wp_localization_validation",
   "wp_mobile",
+  "wp_mobile_cache",
   "wp_rs_cli",
   "wp_rs_web",
   "wp_serde_helper",

Cargo.toml

@@ -2,9 +2,9 @@ package rs.wordpress.cache.kotlin
 
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.withContext
-import uniffi.wp_api.DatabaseDelegate
-import uniffi.wp_api.UpdateHook
-import uniffi.wp_api.WpApiCache
+import uniffi.wp_mobile_cache.DatabaseDelegate
+import uniffi.wp_mobile_cache.UpdateHook
+import uniffi.wp_mobile_cache.WpApiCache
 import java.nio.file.Path
 import java.util.concurrent.Executors
 
@@ -13,6 +13,7 @@ class WordPressApiCacheLoggingDelegate : DatabaseDelegate {
         println("Received update: $updateHook")
     }
 }
+
 class WordPressApiCacheDelegate(
     private val callback: (updateHook: UpdateHook) -> Unit
 ) : DatabaseDelegate {
@@ -31,7 +32,10 @@ class WordPressApiCache {
     constructor(delegate: WordPressApiCacheDelegate? = null) : this(":memory:", delegate)
 
     // Creates a new cache at the specified file system URL
-    constructor(path: Path, delegate: WordPressApiCacheDelegate? = null) : this(path.toString(), delegate)
+    constructor(path: Path, delegate: WordPressApiCacheDelegate? = null) : this(
+        path.toString(),
+        delegate
+    )
 
     // Creates a new cache at the specified path
     constructor(string: String, delegate: WordPressApiCacheDelegate? = null) {
@@ -42,6 +46,7 @@ class WordPressApiCache {
     suspend fun performMigrations(): Int = withContext(internalDispatcher) {
         cache.performMigrations().toInt()
     }
+
     fun startListeningForUpdates() {
         if (this.delegate != null) {
             this.cache.startListeningForUpdates(this.delegate)

native/kotlin/api/kotlin/src/main/kotlin/rs/wordpress/cache/kotlin/WordPressApiCache.kt

@@ -33,6 +33,7 @@ allprojects {
         exclude("**/wp_api.kt")
         exclude("**/wp_localization.kt")
         exclude("**/wp_mobile.kt")
+        exclude("**/wp_mobile_cache.kt")
     }
 
     tasks.withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
@@ -42,6 +43,7 @@ allprojects {
         exclude("**/wp_api.kt")
         exclude("**/wp_localization.kt")
         exclude("**/wp_mobile.kt")
+        exclude("**/wp_mobile_cache.kt")
     }
 
     dependencies {

native/kotlin/build.gradle.kts

@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2024"
 
 [features]
-default = ["rusqlite/bundled"]
 export-uncancellable-endpoints = ["wp_derive_request_builder/export-uncancellable-endpoints"]
 integration-tests = []
 reqwest-request-executor = ["dep:reqwest", "dep:tokio", "dep:hyper-util", "dep:rustls", "dep:hickory-resolver", "dep:hyper", "dep:h2"]
@@ -49,7 +48,6 @@ wp_localization = { path = "../wp_localization" }
 wp_localization_macro = { path = "../wp_localization_macro" }
 wp_serde_helper = { path = "../wp_serde_helper" }
 x509-cert = { workspace = true }
-rusqlite = { version = "0.37.0", features = ["hooks"] }
 
 [dev-dependencies]
 rstest = { workspace = true }

wp_api/Cargo.toml

@@ -6,7 +6,6 @@ use users::*;
 use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};
 use wp_localization_macro::WpDeriveLocalizable;
 
-pub mod cache;
 pub mod jetpack;
 pub mod wp_com;
 

wp_api/src/cache/mod.rs

@@ -13,6 +13,7 @@ name = "wp_mobile"
 [dependencies]
 uniffi = { workspace = true }
 wp_api = { path = "../wp_api" }
+wp_mobile_cache = { path = "../wp_mobile_cache" }
 
 [build-dependencies]
 uniffi = { workspace = true , features = [ "build", "cli" ] }

wp_api/src/lib.rs

@@ -1,5 +1,6 @@
-// Re-export wp_api to ensure its bindings are generated
+// Re-export to ensure its bindings are generated
 pub use wp_api;
+pub use wp_mobile_cache;
 
 #[uniffi::export]
 fn wp_mobile_crate_works(input: String) -> String {

wp_mobile/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "wp_mobile_cache"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+default = ["rusqlite/bundled"]
+
+[dependencies]
+rusqlite = { version = "0.37.0", features = ["hooks"] }
+thiserror = { workspace = true }
+uniffi = { workspace = true }
+wp_api = { path = "../wp_api" }