From 556111bd39281e88b4e33da245f2dc7ca7d459dd Mon Sep 17 00:00:00 2001 From: evdokimovs <49490279+evdokimovs@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:26:37 -0300 Subject: [PATCH] Upgrade `flutter_rust_bridge` crate to 2.7.0 version (#183) --- CHANGELOG.md | 12 +++-- Cargo.lock | 17 ++++--- crates/native/Cargo.toml | 3 +- crates/native/src/frb_generated.rs | 6 +-- example/pubspec.lock | 56 ++++++++++++------------ lib/src/api/bridge/api.dart | 2 +- lib/src/api/bridge/frb_generated.dart | 24 +--------- lib/src/api/bridge/frb_generated.io.dart | 2 +- lib/src/api/bridge/lib.dart | 2 +- lib/src/api/bridge/renderer.dart | 2 +- pubspec.yaml | 2 +- 11 files changed, 56 insertions(+), 72 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7d0f6aa5c..350e66ced6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,12 +15,15 @@ All user visible changes to this project will be documented in this file. This p - Upgraded [OpenAL] library to [1.24.1][openal-1.24.1] version. ([#182], [#181]) - Upgraded [libwebrtc] to [131.0.6778.85-r1] version. ([#180]) +- Upgraded [`flutter_rust_bridge`] crate to [2.7.0][frb-2.7.0] version. ([#183]) [#180]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/180 [#181]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/181 [#182]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/182 -[openal-1.24.1]: https://github.com/kcat/openal-soft/releases/tag/1.24.1 +[#183]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/183 [131.0.6778.85-r1]: https://github.com/instrumentisto/libwebrtc-bin/releases/tag/131.0.6778.85-r1 +[openal-1.24.1]: https://github.com/kcat/openal-soft/releases/tag/1.24.1 +[frb-2.7.0]: https://github.com/fzyzcjy/flutter_rust_bridge/releases/tag/v2.7.0 @@ -36,7 +39,7 @@ All user visible changes to this project will be documented in this file. This p ### Changed -- Upgraded `flutter_rust_bridge` to 2.4.0 version. ([#172]) +- Upgraded [`flutter_rust_bridge`] crate to [2.4.0][frb-2.4.0] version. ([#172]) - Upgraded [libwebrtc] to [130.0.6723.69] version. ([#176], [#177]) ### Fixed @@ -49,6 +52,7 @@ All user visible changes to this project will be documented in this file. This p [#176]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/176 [#177]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/177 [130.0.6723.69]: https://github.com/instrumentisto/libwebrtc-bin/releases/tag/130.0.6723.69 +[frb-2.4.0]: https://github.com/fzyzcjy/flutter_rust_bridge/releases/tag/v2.4.0 @@ -75,9 +79,10 @@ All user visible changes to this project will be documented in this file. This p ### Changed -- Upgraded `flutter_rust_bridge` to 2.2.0 version. ([#167]) +- Upgraded [`flutter_rust_bridge`] crate to [2.2.0][frb-2.2.0] version. ([#167]) [#167]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/167 +[frb-2.2.0]: https://github.com/fzyzcjy/flutter_rust_bridge/releases/tag/v2.2.0 @@ -297,6 +302,7 @@ See [changelog in upstream repository](https://github.com/flutter-webrtc/flutter +[`flutter_rust_bridge`]: https://docs.rs/flutter_rust_bridge [Android]: https://www.android.com [Dart]: https://dart.dev [Flutter]: https://www.flutter.dev diff --git a/Cargo.lock b/Cargo.lock index 88234a71c4..c67d59cb18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,10 +297,10 @@ dependencies = [ ] [[package]] -name = "dart-sys-fork" -version = "4.1.1" +name = "dart-sys" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dafff26172b719bb9695dd3715a1e7792f62dcdc8a5d4c740db7e0fedee8b" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", ] @@ -427,16 +427,16 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff967a5893be60d849e4362910762acdc275febe44333153a11dcec1bca2cd2" +checksum = "5419323ff3ae8b63ed20b7cd0fd0e3e73fa9234b3b212b87b5586fe76ae52318" dependencies = [ "allo-isolate", "anyhow", "build-target", "bytemuck", "byteorder", - "dart-sys-fork", + "dart-sys", "delegate-attr", "flutter_rust_bridge_macros", "futures", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48b4d3fae9d29377b19134a38386d8792bde70b9448cde49e96391bcfc8fed1" +checksum = "9c6fd06cacc0dfe931d00f3acdc5ac6c5dd9382b33dd78d71cce8f0a62e9458b" dependencies = [ "hex", "md-5", @@ -1084,7 +1084,6 @@ dependencies = [ "dashmap", "derive_more", "flutter_rust_bridge", - "flutter_rust_bridge_macros", "lazy_static", "libpulse-binding", "libudev", diff --git a/crates/native/Cargo.toml b/crates/native/Cargo.toml index 7a493ac41a..35ad8f10c7 100644 --- a/crates/native/Cargo.toml +++ b/crates/native/Cargo.toml @@ -12,8 +12,7 @@ anyhow = "1.0" cxx = "1.0" dashmap = "6.0" derive_more = { version = "1.0", features = ["as_ref", "display", "from", "into"] } -flutter_rust_bridge = { version = "=2.4.0", features = ["anyhow", "dart-opaque", "rust-async", "thread-pool"], default-features = false } -flutter_rust_bridge_macros = { version = "=2.4.0", default-features = false } +flutter_rust_bridge = { version = "=2.7.0", features = ["anyhow", "dart-opaque", "rust-async", "thread-pool"], default-features = false } lazy_static = "1.5" libwebrtc-sys = { path = "../libwebrtc-sys" } log = "0.4" diff --git a/crates/native/src/frb_generated.rs b/crates/native/src/frb_generated.rs index fac184d022..890a821c79 100644 --- a/crates/native/src/frb_generated.rs +++ b/crates/native/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. #![allow( non_camel_case_types, @@ -37,7 +37,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.7.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -1353945569; // Section: executor @@ -6111,7 +6111,7 @@ impl SseEncode for crate::api::VideoConstraints { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.4.0. + // @generated by `flutter_rust_bridge`@ 2.7.0. // Section: imports diff --git a/example/pubspec.lock b/example/pubspec.lock index 21d65adf14..97b7e27158 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -26,10 +26,10 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: @@ -90,10 +90,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.12" + version: "2.4.13" build_runner_core: dependency: transitive description: @@ -146,10 +146,10 @@ packages: dependency: transitive description: name: code_builder - sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" url: "https://pub.dev" source: hosted - version: "4.10.0" + version: "4.10.1" collection: dependency: transitive description: @@ -162,18 +162,18 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -218,10 +218,10 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -244,10 +244,10 @@ packages: dependency: transitive description: name: flutter_rust_bridge - sha256: a43a6649385b853bc836ef2bc1b056c264d476c35e131d2d69c38219b5e799f1 + sha256: "35c257fc7f98e34c1314d6c145e5ed54e7c94e8a9f469947e31c9298177d546f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.7.0" flutter_test: dependency: "direct dev" description: flutter @@ -315,10 +315,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: transitive description: @@ -371,10 +371,10 @@ packages: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" macros: dependency: transitive description: @@ -418,10 +418,10 @@ packages: dependency: transitive description: name: mime - sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "2.0.0" package_config: dependency: transitive description: @@ -490,10 +490,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67 url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -583,18 +583,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vector_math: dependency: transitive description: @@ -623,10 +623,10 @@ packages: dependency: transitive description: name: web - sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" web_socket: dependency: transitive description: diff --git a/lib/src/api/bridge/api.dart b/lib/src/api/bridge/api.dart index 60d8e7dbd6..2b3a8d467b 100644 --- a/lib/src/api/bridge/api.dart +++ b/lib/src/api/bridge/api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/api/bridge/frb_generated.dart b/lib/src/api/bridge/frb_generated.dart index 1c4c1581cb..0a20a2235c 100644 --- a/lib/src/api/bridge/frb_generated.dart +++ b/lib/src/api/bridge/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -68,7 +68,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.4.0'; + String get codegenVersion => '2.7.0'; @override int get rustContentHash => -1353945569; @@ -4395,8 +4395,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case GetMediaError_Video(field0: final field0): sse_encode_i_32(1, serializer); sse_encode_String(field0, serializer); - default: - throw UnimplementedError(''); } } @@ -4411,8 +4409,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case GetMediaResult_Err(field0: final field0): sse_encode_i_32(1, serializer); sse_encode_box_autoadd_get_media_error(field0, serializer); - default: - throw UnimplementedError(''); } } @@ -4852,8 +4848,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case PeerConnectionEvent_Track(field0: final field0): sse_encode_i_32(8, serializer); sse_encode_box_autoadd_rtc_track_event(field0, serializer); - default: - throw UnimplementedError(''); } } @@ -4908,8 +4902,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case RtcIceCandidateStats_Remote(field0: final field0): sse_encode_i_32(1, serializer); sse_encode_box_autoadd_ice_candidate_stats(field0, serializer); - default: - throw UnimplementedError(''); } } @@ -4968,8 +4960,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_opt_box_autoadd_u_32(sliCount, serializer); sse_encode_opt_box_autoadd_u_64(concealmentEvents, serializer); sse_encode_opt_box_autoadd_i_32(framesReceived, serializer); - default: - throw UnimplementedError(''); } } @@ -5002,8 +4992,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_opt_box_autoadd_f_64(totalSamplesDuration, serializer); sse_encode_opt_box_autoadd_f_64(echoReturnLoss, serializer); sse_encode_opt_box_autoadd_f_64(echoReturnLossEnhancement, serializer); - default: - throw UnimplementedError(''); } } @@ -5028,8 +5016,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_opt_box_autoadd_u_32(frameWidth, serializer); sse_encode_opt_box_autoadd_u_32(frameHeight, serializer); sse_encode_opt_box_autoadd_f_64(framesPerSecond, serializer); - default: - throw UnimplementedError(''); } } @@ -5192,8 +5178,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_opt_box_autoadd_u_64(reportsSent, serializer); case RtcStatsType_Unimplemented(): sse_encode_i_32(8, serializer); - default: - throw UnimplementedError(''); } } @@ -5314,8 +5298,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case TextureEvent_OnFirstFrameRendered(textureId: final textureId): sse_encode_i_32(1, serializer); sse_encode_i_64(textureId, serializer); - default: - throw UnimplementedError(''); } } @@ -5330,8 +5312,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_u_32(field0, serializer); case TrackEvent_TrackCreated(): sse_encode_i_32(2, serializer); - default: - throw UnimplementedError(''); } } diff --git a/lib/src/api/bridge/frb_generated.io.dart b/lib/src/api/bridge/frb_generated.io.dart index 7a8105bde7..78c80e8ebd 100644 --- a/lib/src/api/bridge/frb_generated.io.dart +++ b/lib/src/api/bridge/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/lib/src/api/bridge/lib.dart b/lib/src/api/bridge/lib.dart index 0c18c08c70..cdf380297f 100644 --- a/lib/src/api/bridge/lib.dart +++ b/lib/src/api/bridge/lib.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/lib/src/api/bridge/renderer.dart b/lib/src/api/bridge/renderer.dart index e881608dea..ae8ba231e1 100644 --- a/lib/src/api/bridge/renderer.dart +++ b/lib/src/api/bridge/renderer.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/pubspec.yaml b/pubspec.yaml index b7e08c4e1d..ed74295a4c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: ffi: ^2.0.2 flutter: sdk: flutter - flutter_rust_bridge: 2.4.0 # should be the same as in `Cargo.lock` + flutter_rust_bridge: 2.7.0 # should be the same as in `Cargo.lock` freezed_annotation: ^2.4.4 uuid: ^4.4.2 web: ">=0.5.1 <2.0.0"