From ff502b7cce2f4291f9abf80a140380cb0e8631e0 Mon Sep 17 00:00:00 2001 From: Antonius Naumann Date: Tue, 18 Jun 2024 00:15:11 +0200 Subject: [PATCH] Upgrade UniFFI version to 0.28 --- Cargo.lock | 30 ++++++++----------- Cargo.toml | 4 +-- README.md | 1 + .../greeter/Cargo.toml | 2 +- .../greeter/greeter-lib/Cargo.toml | 2 +- .../hello-world-macro/greeter/Cargo.toml | 2 +- swift-examples/hello-world/greeter/Cargo.toml | 4 +-- templates/template.toml | 4 +-- 8 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1218bf6..6bc8e3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,7 +225,7 @@ version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -360,12 +360,6 @@ dependencies = [ "scroll", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -729,9 +723,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "uniffi_bindgen" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be2bc6bafd82c979b0faca77c7b26630d54017de9f5bd5a686ec6ef038ad5d9" +checksum = "96061d7e01b185aa405f7c9b134741ab3e50cc6796a47d6fd8ab9a5364b5feed" dependencies = [ "anyhow", "askama", @@ -740,7 +734,7 @@ dependencies = [ "fs-err", "glob", "goblin", - "heck 0.4.1", + "heck", "once_cell", "paste", "serde", @@ -753,9 +747,9 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c400339a9d1d17be34257d0b407e91d64af335e5b4fa49f4bf28467fc8d635" +checksum = "2fcfa22f55829d3aaa7acfb1c5150224188fe0f27c59a8a3eddcaa24d1ffbe58" dependencies = [ "quote", "syn", @@ -763,9 +757,9 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583bab49f2bdf5681f9732f8b67a7e555ad920dbb5427be21450217bf1818189" +checksum = "7663eacdbd9fbf4a88907ddcfe2e6fa85838eb6dc2418a7d91eebb3786f8e20b" dependencies = [ "anyhow", "bytes", @@ -775,9 +769,9 @@ dependencies = [ [[package]] name = "uniffi_testing" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13963044ca9bde9b709d2eee68bc11dafc7acea144ae0fdc0cf29ed4add44481" +checksum = "f922465f7566f25f8fe766920205fdfa9a3fcdc209c6bfb7557f0b5bf45b04dd" dependencies = [ "anyhow", "camino", @@ -788,9 +782,9 @@ dependencies = [ [[package]] name = "uniffi_udl" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92f984bb0d9a06778f256aec963e1e9a80714014f7a90fb0e01008821fe5a97" +checksum = "cef408229a3a407fafa4c36dc4f6ece78a6fb258ab28d2b64bddd49c8cb680f6" dependencies = [ "anyhow", "textwrap", diff --git a/Cargo.toml b/Cargo.toml index 495c1f7..28e1c3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-swift" description = "A cargo plugin to easily build Swift packages from Rust code for use in iOS and macOS applications" -version = "0.7.1" +version = "0.8.0" edition = "2021" authors = ["Antonius Naumann "] license = "MIT OR Apache-2.0" @@ -35,7 +35,7 @@ execute = "0.2.13" indicatif = "0.17.8" # FFI Bindings -uniffi_bindgen = { version = "0.27.0" } +uniffi_bindgen = { version = "0.28.0" } # Error Handling anyhow = "1.0.81" diff --git a/README.md b/README.md index 61a2538..c59a5b1 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Currently, `cargo swift` does not detect the UniFFI version of your project auto | 0.25 | 0.5 | | 0.26 | 0.6 | | 0.27 | 0.7 | +| 0.28 | 0.8 | To do so, run ``` diff --git a/swift-examples/hello-world-macro-multi-crate/greeter/Cargo.toml b/swift-examples/hello-world-macro-multi-crate/greeter/Cargo.toml index 9d3daf8..e3b1ce9 100644 --- a/swift-examples/hello-world-macro-multi-crate/greeter/Cargo.toml +++ b/swift-examples/hello-world-macro-multi-crate/greeter/Cargo.toml @@ -12,5 +12,5 @@ crate-type = ["cdylib", "staticlib", "lib"] name = "greeter" [dependencies] -uniffi = "0.27" +uniffi = "0.28" greeter-lib = { path = "./greeter-lib" } diff --git a/swift-examples/hello-world-macro-multi-crate/greeter/greeter-lib/Cargo.toml b/swift-examples/hello-world-macro-multi-crate/greeter/greeter-lib/Cargo.toml index 73a6d3a..2dbb3e8 100644 --- a/swift-examples/hello-world-macro-multi-crate/greeter/greeter-lib/Cargo.toml +++ b/swift-examples/hello-world-macro-multi-crate/greeter/greeter-lib/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -uniffi = "0.27" +uniffi = "0.28" diff --git a/swift-examples/hello-world-macro/greeter/Cargo.toml b/swift-examples/hello-world-macro/greeter/Cargo.toml index c824f68..5325026 100644 --- a/swift-examples/hello-world-macro/greeter/Cargo.toml +++ b/swift-examples/hello-world-macro/greeter/Cargo.toml @@ -10,4 +10,4 @@ crate-type = ["cdylib", "staticlib", "lib"] name = "greeter" [dependencies] -uniffi = "0.27" +uniffi = "0.28" diff --git a/swift-examples/hello-world/greeter/Cargo.toml b/swift-examples/hello-world/greeter/Cargo.toml index f05efa7..055a17d 100644 --- a/swift-examples/hello-world/greeter/Cargo.toml +++ b/swift-examples/hello-world/greeter/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "staticlib", "lib"] name = "greeter" [dependencies] -uniffi = "0.27" +uniffi = "0.28" [build-dependencies] -uniffi = { version = "0.27", features = ["build"] } +uniffi = { version = "0.28", features = ["build"] } diff --git a/templates/template.toml b/templates/template.toml index 0964665..72e6372 100644 --- a/templates/template.toml +++ b/templates/template.toml @@ -10,9 +10,9 @@ crate-type = ["{{ lib_type }}", "lib"] name = "{{ namespace }}" [dependencies] -uniffi = "0.27" +uniffi = "0.28" {% if !macro_only %} [build-dependencies] -uniffi = { version = "0.27", features = ["build"] } +uniffi = { version = "0.28", features = ["build"] } {%- endif %}