Add support for uniffi 0.23

PyO3 · Feb 14, 2023 · d7b21ab · d7b21ab
1 parent f69fdcc
commit d7b21ab
Show file tree

Hide file tree

Showing 15 changed files with 172 additions and 152 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -53,7 +53,7 @@ macos_arm64_task:
       - cat Cargo.lock
   install_script:
     - brew install python3
-    - python3 -m pip install uniffi-bindgen==0.22.0
+    - python3 -m pip install uniffi-bindgen==0.23.0
   <<: *BUILD_AND_TEST
 
 linux_aarch64_task:
@@ -75,5 +75,5 @@ linux_aarch64_task:
       - echo $CIRRUS_OS
       - cat Cargo.lock
   install_script:
-    - python3 -m pip install uniffi-bindgen==0.22.0
+    - python3 -m pip install uniffi-bindgen==0.23.0
   <<: *BUILD_AND_TEST
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -144,7 +144,7 @@ jobs:
         if: ${{ !contains(matrix.python-version, 'pypy') }}
         run: pip install cffi
       - name: Install python packages
-        run: pip install virtualenv ziglang~=0.10.0 twine uniffi-bindgen==0.22.0
+        run: pip install virtualenv ziglang~=0.10.0 twine uniffi-bindgen==0.23.0
       - uses: dtolnay/rust-toolchain@beta
         id: rustup
         with:

diff --git a/Changelog.md b/Changelog.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Add Cargo compile targets configuration for filtering multiple bin targets in [#1339](https://github.com/PyO3/maturin/pull/1339)
 * Respect `rustflags` settings in cargo configuration file in [#1405](https://github.com/PyO3/maturin/pull/1405)
 * Bump MSRV to 1.63.0 in [#1407](https://github.com/PyO3/maturin/pull/1407)
+* Add support for uniffi 0.23 in [#1481](https://github.com/PyO3/maturin/pull/1481)
 
 ## [0.14.13] - 2023-02-12
 

diff --git a/guide/src/bindings.md b/guide/src/bindings.md
@@ -96,8 +96,10 @@ directory of a virtual environment) once installed.
 uniffi bindings use [uniffi-rs](https://mozilla.github.io/uniffi-rs/) to generate Python `ctypes` bindings
 from an interface definition file. uniffi wheels are compatible with all python versions including pypy.
 
-You need to install [uniffi_bindgen](https://mozilla.github.io/uniffi-rs/tutorial/Prerequisites.html#the-uniffi-bindgen-cli-tool) first to build wheels for `uniffi` bindings:
+You need to install [uniffi-bindgen](https://mozilla.github.io/uniffi-rs/tutorial/Prerequisites.html#the-uniffi-bindgen-cli-tool) first to build wheels for `uniffi` bindings:
 
 ```bash
-cargo install uniffi_bindgen
+pip install uniffi-bindgen==0.23.0
 ```
+
+Note that `uniffi-bindgen` version should be aligned with your Rust `uniffi` dependency version.
diff --git a/src/templates/Cargo.toml.j2 b/src/templates/Cargo.toml.j2
@@ -16,9 +16,8 @@ pyo3 = "0.18.1"
 {% elif bindings == "rust-cpython" -%}
 cpython = "0.7.1"
 {% elif bindings == "uniffi" -%}
-uniffi = "0.21.0"
-uniffi_macros = "0.21.0"
+uniffi = "0.23.0"
 
 [build-dependencies]
-uniffi_build = { version = "0.21.0", features = ["builtin-bindgen"] }
+uniffi = { version = "0.23.0", features = ["build"] }
 {% endif -%}
diff --git a/src/templates/build.rs.j2 b/src/templates/build.rs.j2
@@ -1,5 +1,5 @@
 {%- if bindings == "uniffi" -%}
 fn main() {
-    uniffi_build::generate_scaffolding("./src/example.udl").unwrap();
+    uniffi::generate_scaffolding("./src/example.udl").unwrap();
 }
 {% endif -%}
diff --git a/src/templates/lib.rs.j2 b/src/templates/lib.rs.j2
@@ -25,5 +25,5 @@ fn add(a: u32, b: u32) -> u32 {
     a + b
 }
 
-uniffi_macros::include_scaffolding!("example");
+uniffi::include_scaffolding!("example");
 {%- endif %}