From e05de8d4cea65d16a2610152fce666dc546ddd4e Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 26 Sep 2022 18:55:13 +0200 Subject: [PATCH] chore: Upgrade UniFFI --- .github/workflows/bindings_ci.yml | 2 +- Cargo.lock | 22 +++++++++++----------- bindings/matrix-sdk-crypto-ffi/Cargo.toml | 4 ++-- bindings/matrix-sdk-ffi/Cargo.toml | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/bindings_ci.yml b/.github/workflows/bindings_ci.yml index 7c338b10c..01bc48853 100644 --- a/.github/workflows/bindings_ci.yml +++ b/.github/workflows/bindings_ci.yml @@ -162,7 +162,7 @@ jobs: with: command: install # keep in sync with uniffi dependency in Cargo.toml's - args: uniffi_bindgen --git https://github.com/mozilla/uniffi-rs --rev 091c3561656e72e1a4160412c83b36d98e556d06 + args: uniffi_bindgen --git https://github.com/mozilla/uniffi-rs --rev 17ee82b50ab01182b09a3597b3a340baeca1c9a8 - name: Generate .xcframework working-directory: bindings/apple diff --git a/Cargo.lock b/Cargo.lock index ee82904ba..f70b7c344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4790,8 +4790,8 @@ checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "uniffi" -version = "0.19.6" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +version = "0.20.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "anyhow", "bytes", @@ -4806,8 +4806,8 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.19.6" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +version = "0.20.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "anyhow", "askama", @@ -4828,8 +4828,8 @@ dependencies = [ [[package]] name = "uniffi_build" -version = "0.19.6" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +version = "0.20.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "anyhow", "camino", @@ -4838,8 +4838,8 @@ dependencies = [ [[package]] name = "uniffi_macros" -version = "0.19.6" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +version = "0.20.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "bincode", "camino", @@ -4856,8 +4856,8 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.19.6" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +version = "0.20.0" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "serde", ] @@ -5195,7 +5195,7 @@ dependencies = [ [[package]] name = "weedle2" version = "4.0.0" -source = "git+https://github.com/mozilla/uniffi-rs?rev=091c3561656e72e1a4160412c83b36d98e556d06#091c3561656e72e1a4160412c83b36d98e556d06" +source = "git+https://github.com/mozilla/uniffi-rs?rev=17ee82b50ab01182b09a3597b3a340baeca1c9a8#17ee82b50ab01182b09a3597b3a340baeca1c9a8" dependencies = [ "nom", ] diff --git a/bindings/matrix-sdk-crypto-ffi/Cargo.toml b/bindings/matrix-sdk-crypto-ffi/Cargo.toml index 1b70f7bf4..504a0797c 100644 --- a/bindings/matrix-sdk-crypto-ffi/Cargo.toml +++ b/bindings/matrix-sdk-crypto-ffi/Cargo.toml @@ -28,7 +28,7 @@ thiserror = "1.0.30" tracing = "0.1.34" tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } # keep in sync with uniffi dependency in matrix-sdk-ffi, and uniffi_bindgen in ffi CI job -uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "091c3561656e72e1a4160412c83b36d98e556d06" } +uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "17ee82b50ab01182b09a3597b3a340baeca1c9a8" } zeroize = { version = "1.3.0", features = ["zeroize_derive"] } [dependencies.js_int] @@ -59,7 +59,7 @@ features = ["rt-multi-thread"] version = "0.3.0" [build-dependencies] -uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "091c3561656e72e1a4160412c83b36d98e556d06", features = ["builtin-bindgen"] } +uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "17ee82b50ab01182b09a3597b3a340baeca1c9a8", features = ["builtin-bindgen"] } [dev-dependencies] tempfile = "3.3.0" diff --git a/bindings/matrix-sdk-ffi/Cargo.toml b/bindings/matrix-sdk-ffi/Cargo.toml index d9b203cdf..e096da006 100644 --- a/bindings/matrix-sdk-ffi/Cargo.toml +++ b/bindings/matrix-sdk-ffi/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/matrix-org/matrix-rust-sdk" crate-type = ["staticlib"] [build-dependencies] -uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "091c3561656e72e1a4160412c83b36d98e556d06", features = ["builtin-bindgen"] } +uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "17ee82b50ab01182b09a3597b3a340baeca1c9a8", features = ["builtin-bindgen"] } [dependencies] anyhow = "1.0.51" @@ -34,5 +34,5 @@ tokio-stream = "0.1.8" tracing = "0.1.32" tracing-subscriber = { version = "0.3", features = ["env-filter"] } # keep in sync with uniffi dependency in matrix-sdk-crypto-ffi, and uniffi_bindgen in ffi CI job -uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "091c3561656e72e1a4160412c83b36d98e556d06" } -uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "091c3561656e72e1a4160412c83b36d98e556d06" } +uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "17ee82b50ab01182b09a3597b3a340baeca1c9a8" } +uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "17ee82b50ab01182b09a3597b3a340baeca1c9a8" }