Skip to content

Commit 6e194ea

Browse files
authored
Upgrade flutter_rust_bridge to 2.2.0 version (#167)
1 parent ec91f53 commit 6e194ea

37 files changed

+17352
-10932
lines changed

Cargo.lock

Lines changed: 97 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,12 @@ ifeq ($(shell brew list | grep -Fx llvm),)
299299
brew install llvm
300300
endif
301301
endif
302-
flutter_rust_bridge_codegen --rust-input=crates/native/src/api.rs \
303-
--dart-output=lib/src/api/bridge.g.dart \
304-
--skip-add-mod-to-lib \
305-
--no-build-runner \
306-
--dart-enums-style \
307-
--inline-rust
308-
sed -i$(if $(call eq,$(CURRENT_OS),macos), '',) \
309-
's/^pub use io::\*;$$/pub use self::io::*;/' \
310-
crates/native/src/bridge_generated.rs
302+
flutter_rust_bridge_codegen generate \
303+
--rust-input=crate::api \
304+
--rust-root=crates/native \
305+
--no-add-mod-to-lib \
306+
--dart-output=lib/src/api/bridge \
307+
--no-web
311308
flutter pub run build_runner build --delete-conflicting-outputs
312309

313310

analysis_options.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ analyzer:
77
errors:
88
invalid_use_of_visible_for_testing_member: error
99
exclude:
10-
- '**/*.g.dart'
11-
- '**/*.freezed.dart'
10+
- 'lib/src/api/bridge/**' # autogenerated by `flutter_rust_bridge`
1211

1312
linter:
1413
# List of all available lints can be found here:

crates/native/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ anyhow = "1.0"
1212
cxx = "1.0"
1313
dashmap = "6.0"
1414
derive_more = { version = "1.0", features = ["as_ref", "display", "from", "into"] }
15-
flutter_rust_bridge = { version = "=1.82.4", default-features = false }
16-
flutter_rust_bridge_macros = { version = "=1.82.4", default-features = false }
15+
flutter_rust_bridge = { version = "=2.2.0", features = ["rust-async", "anyhow", "thread-pool", "dart-opaque"], default-features = false }
16+
flutter_rust_bridge_macros = { version = "=2.2.0", default-features = false }
1717
lazy_static = "1.5"
1818
libwebrtc-sys = { path = "../libwebrtc-sys" }
1919
log = "0.4"
@@ -28,6 +28,7 @@ pulse = { version = "2.28", package = "libpulse-binding" }
2828

2929
[target.'cfg(target_os = "windows")'.dependencies]
3030
windows = { version = "0.58", features = ["implement", "Win32_Foundation", "Win32_Graphics_Gdi", "Win32_Media_Audio", "Win32_System_Com", "Win32_UI_Shell_PropertiesSystem", "Win32_UI_WindowsAndMessaging"] }
31+
windows-core = "0.58" # for `#[windows::core]` macro expansion
3132

3233
[build-dependencies]
3334
anyhow = "1.0"

0 commit comments

Comments
 (0)