Update Kotlin wrapper to use wp_mobile crate

Author: oguzkocer

native/kotlin/api/android/build.gradle.kts

@@ -84,7 +84,7 @@ dependencies {
 }
 
 val cargoProjectRoot = rootProject.ext.get("cargoProjectRoot")!!
-val moduleName = "wp_api"
+val moduleName = rootProject.ext.get("rustPrimaryModule").toString()
 cargo {
     cargoCommand = rootProject.ext.get("cargoBinaryPath").toString()
     rustcCommand = rootProject.ext.get("rustcBinaryPath").toString()

native/kotlin/api/kotlin/build.gradle.kts

@@ -84,11 +84,14 @@ sourceSets {
     }
 }
 
+// UniFFI supports generating bindings for multiple crates from a single library file.
+// When wp_mobile is built, it includes wp_api as a dependency, so libwp_mobile contains
+// metadata for both crates. We generate bindings for each crate from the single library.
 val generateUniFFIBindingsTask = tasks.register<Exec>("generateUniFFIBindings") {
     val cargoProjectRoot = rootProject.ext.get("cargoProjectRoot")
     val uniffiGeneratedPath = "${layout.buildDirectory.get()}/generated/source/uniffi/java"
     val nativeLibraryPath = rootProject.ext.get("nativeLibraryPath")!!
-    val rustModuleName = rootProject.ext.get("rustModuleName")
+    val rustPrimaryModule = rootProject.ext.get("rustPrimaryModule")
 
     dependsOn(rootProject.tasks.named("cargoBuildLibraryRelease"))
     workingDir(project.rootDir)
@@ -114,8 +117,6 @@ val generateUniFFIBindingsTask = tasks.register<Exec>("generateUniFFIBindings")
     inputs.dir("$cargoProjectRoot/wp_uniffi_bindgen/")
     // Re-generate if our uniffi-bindgen version changes.
     inputs.file("$cargoProjectRoot/Cargo.lock")
-    // Re-generate if the module source code changes
-    inputs.dir("$cargoProjectRoot/$rustModuleName/")
 }
 
 tasks.named("compileKotlin").configure {

native/kotlin/api/kotlin/src/integrationTest/kotlin/UsersEndpointTest.kt

@@ -6,12 +6,18 @@ import uniffi.wp_api.SparseUserFieldWithEditContext
 import uniffi.wp_api.UserListParams
 import uniffi.wp_api.WpApiParamUsersHasPublishedPosts
 import uniffi.wp_api.WpErrorCode
+import uniffi.wp_mobile.wpMobileCrateWorks
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
 class UsersEndpointTest {
     private val client = defaultApiClient()
 
+    @Test
+    fun testThatWpMobileCrateWorks() = runTest {
+        assertEquals("foo is bar", wpMobileCrateWorks("bar"))
+    }
+
     @Test
     fun testUserListRequest() = runTest {
         val userList = client.request { requestBuilder ->

native/kotlin/build.gradle.kts

@@ -32,6 +32,7 @@ allprojects {
         // Exclude generated bindings
         exclude("**/wp_api.kt")
         exclude("**/wp_localization.kt")
+        exclude("**/wp_mobile.kt")
     }
 
     tasks.withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
@@ -40,6 +41,7 @@ allprojects {
         // Exclude generated bindings
         exclude("**/wp_api.kt")
         exclude("**/wp_localization.kt")
+        exclude("**/wp_mobile.kt")
     }
 
     dependencies {
@@ -52,28 +54,28 @@ val rustcBinaryPath = resolveBinary("rustc")
 val cargoProjectRoot = "${project.rootDir}/../.."
 val jniLibsPath = "${layout.buildDirectory.get()}/jniLibs/"
 val generatedTestResourcesPath = "${layout.buildDirectory.get()}/generatedTestResources/"
-val rustModuleName = "wp_api"
+val rustPrimaryModule = "wp_mobile"
 val nativeLibraryPath =
-    "$cargoProjectRoot/target/release/lib${rustModuleName}${getNativeLibraryExtension()}"
+    "$cargoProjectRoot/target/release/lib${rustPrimaryModule}${getNativeLibraryExtension()}"
 
 rootProject.ext.set("cargoBinaryPath", cargoBinaryPath)
 rootProject.ext.set("rustcBinaryPath", rustcBinaryPath)
 rootProject.ext.set("cargoProjectRoot", cargoProjectRoot)
 rootProject.ext.set("jniLibsPath", jniLibsPath)
 rootProject.ext.set("generatedTestResourcesPath", generatedTestResourcesPath)
 rootProject.ext.set("nativeLibraryPath", nativeLibraryPath)
-rootProject.ext.set("rustModuleName", rustModuleName)
+rootProject.ext.set("rustPrimaryModule", rustPrimaryModule)
 
 setupJniAndBindings()
 
 // Separated as a function to have everything in a scope and keep it contained
 fun setupJniAndBindings() {
     val nativeLibraryPath =
-        "$cargoProjectRoot/target/release/lib${rustModuleName}${getNativeLibraryExtension()}"
+        "$cargoProjectRoot/target/release/lib${rustPrimaryModule}${getNativeLibraryExtension()}"
 
     val cargoBuildLibraryReleaseTask = tasks.register<Exec>("cargoBuildLibraryRelease") {
         workingDir(rootProject.ext.get("cargoProjectRoot")!!)
-        commandLine(cargoBinaryPath, "build", "--package", rustModuleName, "--release")
+        commandLine(cargoBinaryPath, "build", "--package", rustPrimaryModule, "--release")
         // No inputs.dir added, because we want to always re-run this task and let Cargo handle caching
     }