From 70dd02012b4a52d703a600da72de6c332c873165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Wed, 4 Feb 2026 10:37:51 +0100 Subject: [PATCH] fix(ffi): Don't override the default `package_name` and `cdylib_name` values for Kotlin bindings Otherwise, the bindings expect the generated JAR/AAR files to contain separate `.so` libraries for each crate --- bindings/matrix-sdk-ffi/CHANGELOG.md | 3 ++- crates/matrix-sdk-base/uniffi.toml | 2 -- crates/matrix-sdk-common/uniffi.toml | 2 -- crates/matrix-sdk-crypto/uniffi.toml | 2 -- crates/matrix-sdk-ui/uniffi.toml | 2 -- crates/matrix-sdk/uniffi.toml | 2 -- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/bindings/matrix-sdk-ffi/CHANGELOG.md b/bindings/matrix-sdk-ffi/CHANGELOG.md index cc4cf688a..331d38294 100644 --- a/bindings/matrix-sdk-ffi/CHANGELOG.md +++ b/bindings/matrix-sdk-ffi/CHANGELOG.md @@ -14,7 +14,8 @@ All notable changes to this project will be documented in this file. [this issue](https://github.com/mozilla/uniffi-rs/issues/2740)). ([#6069](https://github.com/matrix-org/matrix-rust-sdk/pull/6069), [#6112](https://github.com/matrix-org/matrix-rust-sdk/pull/6112), -[#6115](https://github.com/matrix-org/matrix-rust-sdk/pull/6115)). +[#6115](https://github.com/matrix-org/matrix-rust-sdk/pull/6115), +[#6116](https://github.com/matrix-org/matrix-rust-sdk/pull/6116)). - `Client::create_room` now uses `RoomPowerLevelsContentOverride` under the hood instead of `RoomPowerLevelsEventContent` to be able to explicitly set values which would previously be ignored if they matched the default power level values specified by the spec: these may not be diff --git a/crates/matrix-sdk-base/uniffi.toml b/crates/matrix-sdk-base/uniffi.toml index 600f03ba2..b4d6f5c0f 100644 --- a/crates/matrix-sdk-base/uniffi.toml +++ b/crates/matrix-sdk-base/uniffi.toml @@ -1,6 +1,4 @@ [bindings.kotlin] -package_name = "uniffi.matrix_sdk_base" -cdylib_name = "matrix_sdk_base" android_cleaner = true # Checksums are incorrectly failing for users with 32bit (and sometimes 64bit?) devices at the moment # Remove once https://github.com/mozilla/uniffi-rs/issues/2740 is fixed or JNI is used instead of JNA diff --git a/crates/matrix-sdk-common/uniffi.toml b/crates/matrix-sdk-common/uniffi.toml index 4367bb79c..b4d6f5c0f 100644 --- a/crates/matrix-sdk-common/uniffi.toml +++ b/crates/matrix-sdk-common/uniffi.toml @@ -1,6 +1,4 @@ [bindings.kotlin] -package_name = "uniffi.matrix_sdk_common" -cdylib_name = "matrix_sdk_common" android_cleaner = true # Checksums are incorrectly failing for users with 32bit (and sometimes 64bit?) devices at the moment # Remove once https://github.com/mozilla/uniffi-rs/issues/2740 is fixed or JNI is used instead of JNA diff --git a/crates/matrix-sdk-crypto/uniffi.toml b/crates/matrix-sdk-crypto/uniffi.toml index a49c0134d..b4d6f5c0f 100644 --- a/crates/matrix-sdk-crypto/uniffi.toml +++ b/crates/matrix-sdk-crypto/uniffi.toml @@ -1,6 +1,4 @@ [bindings.kotlin] -package_name = "uniffi.matrix_sdk_crypto" -cdylib_name = "matrix_sdk_crypto" android_cleaner = true # Checksums are incorrectly failing for users with 32bit (and sometimes 64bit?) devices at the moment # Remove once https://github.com/mozilla/uniffi-rs/issues/2740 is fixed or JNI is used instead of JNA diff --git a/crates/matrix-sdk-ui/uniffi.toml b/crates/matrix-sdk-ui/uniffi.toml index 9b08ae1df..b4d6f5c0f 100644 --- a/crates/matrix-sdk-ui/uniffi.toml +++ b/crates/matrix-sdk-ui/uniffi.toml @@ -1,6 +1,4 @@ [bindings.kotlin] -package_name = "uniffi.matrix_sdk_ui" -cdylib_name = "matrix_sdk_ui" android_cleaner = true # Checksums are incorrectly failing for users with 32bit (and sometimes 64bit?) devices at the moment # Remove once https://github.com/mozilla/uniffi-rs/issues/2740 is fixed or JNI is used instead of JNA diff --git a/crates/matrix-sdk/uniffi.toml b/crates/matrix-sdk/uniffi.toml index b5f20cc98..b4d6f5c0f 100644 --- a/crates/matrix-sdk/uniffi.toml +++ b/crates/matrix-sdk/uniffi.toml @@ -1,6 +1,4 @@ [bindings.kotlin] -package_name = "uniffi.matrix_sdk" -cdylib_name = "matrix_sdk" android_cleaner = true # Checksums are incorrectly failing for users with 32bit (and sometimes 64bit?) devices at the moment # Remove once https://github.com/mozilla/uniffi-rs/issues/2740 is fixed or JNI is used instead of JNA