From 279f0d64b2f06dd0ed7f00bea360cc242e446e7d Mon Sep 17 00:00:00 2001 From: Antonius Naumann Date: Fri, 26 Jan 2024 10:46:45 +0000 Subject: [PATCH] Update UniFFI version --- Cargo.lock | 61 +++++++++++++------ Cargo.toml | 12 ++-- .../hello-world-macro/greeter/Cargo.toml | 2 +- swift-examples/hello-world/greeter/Cargo.toml | 4 +- templates/template.toml | 4 +- 5 files changed, 54 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 833f128..72d364e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,9 +349,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "goblin" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" +checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" dependencies = [ "log", "plain", @@ -549,18 +549,18 @@ checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scroll" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", @@ -619,6 +619,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + [[package]] name = "strsim" version = "0.10.0" @@ -636,6 +642,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + [[package]] name = "thiserror" version = "1.0.56" @@ -686,6 +703,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + [[package]] name = "unicode-segmentation" version = "1.10.1" @@ -700,9 +723,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "uniffi_bindgen" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd992f2929a053829d5875af1eff2ee3d7a7001cb3b9a46cc7895f2caede6940" +checksum = "ab31006ab9c9c6870739f0e74235729d1478d82e73571b8f53c25aa176d67535" dependencies = [ "anyhow", "askama", @@ -715,6 +738,7 @@ dependencies = [ "once_cell", "paste", "serde", + "textwrap", "toml", "uniffi_meta", "uniffi_testing", @@ -723,9 +747,9 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55137c122f712d9330fd985d66fa61bdc381752e89c35708c13ce63049a3002c" +checksum = "72775b3afa6adb30e0c92b3107858d2fcb0ff1a417ac242db1f648b0e2dd0ef2" dependencies = [ "quote", "syn", @@ -733,9 +757,9 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71dc8573a7b1ac4b71643d6da34888273ebfc03440c525121f1b3634ad3417a2" +checksum = "3f64a99e905671738d9d293f9cce58708ce1af8e13ea29f9d6b6925114fc2e85" dependencies = [ "anyhow", "bytes", @@ -745,9 +769,9 @@ dependencies = [ [[package]] name = "uniffi_testing" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118448debffcb676ddbe8c5305fb933ab7e0123753e659a71dc4a693f8d9f23c" +checksum = "cdca5719a22edf34c8239cc6ac9e3906d7ebc2a3e8a5e6ece4c3dffc312a4251" dependencies = [ "anyhow", "camino", @@ -758,11 +782,12 @@ dependencies = [ [[package]] name = "uniffi_udl" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889edb7109c6078abe0e53e9b4070cf74a6b3468d141bdf5ef1bd4d1dc24a1c3" +checksum = "3f6817c15714acccd0d0459f99b524cabebfdd622376464a2c6466a6485bdb4b" dependencies = [ "anyhow", + "textwrap", "uniffi_meta", "uniffi_testing", "weedle2", @@ -782,9 +807,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "weedle2" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e79c5206e1f43a2306fd64bdb95025ee4228960f2e6c5a8b173f3caaf807741" +checksum = "998d2c24ec099a87daf9467808859f9d82b61f1d9c9701251aea037f514eae0e" dependencies = [ "nom", ] diff --git a/Cargo.toml b/Cargo.toml index 3277ce6..861147e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,28 +19,28 @@ exclude = ["/readme", "/.github", "/testing", "/swift-examples", "*-DRAFT.md"] [dependencies] camino = "1.1.6" cargo_metadata = "0.18.1" -clap = { version = "4.4.8", features = ["derive"] } +clap = { version = "4.4.18", features = ["derive"] } convert_case = "0.6.0" nonempty = "0.9.0" -serde = { version = "1.0.193", features = ["derive"] } +serde = { version = "1.0.195", features = ["derive"] } # Templating askama = "0.12.1" # Terminal UI -console = "0.15.7" +console = "0.15.8" dialoguer = { version = "0.11.0", default-features = false } execute = "0.2.13" indicatif = "0.17.7" # FFI Bindings -uniffi_bindgen = { version = "0.25.2" } +uniffi_bindgen = { version = "0.26.1" } # Allow testing with the latest dev version of UniFFI # uniffi_bindgen = { version = "0.25.2", git = "https://github.com/mozilla/uniffi-rs.git" } # Error Handling -anyhow = "1.0.75" -thiserror = "1.0.50" +anyhow = "1.0.79" +thiserror = "1.0.56" lazy_static = "1.4.0" itertools = "0.12.0" diff --git a/swift-examples/hello-world-macro/greeter/Cargo.toml b/swift-examples/hello-world-macro/greeter/Cargo.toml index 5e6afd6..757a985 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.25" +uniffi = "0.26" diff --git a/swift-examples/hello-world/greeter/Cargo.toml b/swift-examples/hello-world/greeter/Cargo.toml index 56eba82..07d3be7 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.25" +uniffi = "0.26" [build-dependencies] -uniffi = { version = "0.25", features = ["build"] } +uniffi = { version = "0.26", features = ["build"] } diff --git a/templates/template.toml b/templates/template.toml index 64c1d05..d9cd313 100644 --- a/templates/template.toml +++ b/templates/template.toml @@ -10,9 +10,9 @@ crate-type = ["{{ lib_type }}", "lib"] name = "{{ namespace }}" [dependencies] -uniffi = "0.25" +uniffi = "0.26" {% if !macro_only %} [build-dependencies] -uniffi = { version = "0.25", features = ["build"] } +uniffi = { version = "0.26", features = ["build"] } {%- endif %}