diff --git a/CHANGELOG.md b/CHANGELOG.md index e13f52d4..ea288a84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,16 @@ All user visible changes to this project will be documented in this file. This p ### Changed -- Replaced [`wee_alloc`] allocator with [`talc`] for web. ([#187]) +- Dependencies: + - Replaced [`wee_alloc`] allocator with [`talc`] for web. ([#187]) + +### Upgraded + +- Dependencies: + - [`flutter_rust_bridge`] to 2.4.0 version. ([#188]) [#187]: /../../pull/187 +[#188]: /../../pull/188 diff --git a/Cargo.lock b/Cargo.lock index 4ad29d11..211cf5e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1276,9 +1276,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db18c05aac3922abfe24282af9128947d2b27856f3d6a4f30888bffa976855a" +checksum = "6ff967a5893be60d849e4362910762acdc275febe44333153a11dcec1bca2cd2" dependencies = [ "allo-isolate", "anyhow", @@ -1299,9 +1299,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83de8013ddf893c420794e8a722f941eeca7f4939b46434282d66b676a0997c" +checksum = "d48b4d3fae9d29377b19134a38386d8792bde70b9448cde49e96391bcfc8fed1" dependencies = [ "hex", "md-5", diff --git a/Cargo.toml b/Cargo.toml index fff20aed..2925309a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ simple_logger = "5.0" [target.'cfg(not(target_family = "wasm"))'.dependencies] # TODO: Switch to `dart-sys` once `flutter_rust_bridge` does. dart-sys = { version = "4.1", package = "dart-sys-fork" } -flutter_rust_bridge = { version = "=2.2.0", features = ["anyhow", "dart-opaque", "rust-async"], default-features = false } +flutter_rust_bridge = { version = "=2.4.0", features = ["anyhow", "dart-opaque", "rust-async"], default-features = false } libc = "0.2" send_wrapper = "0.6" diff --git a/flutter/CHANGELOG.md b/flutter/CHANGELOG.md index 43c85ff3..d665a9a8 100644 --- a/flutter/CHANGELOG.md +++ b/flutter/CHANGELOG.md @@ -6,6 +6,21 @@ All user visible changes to this project will be documented in this file. This p +## [0.7.0] · 2024-??-?? (unreleased) +[0.7.0]: /../../tree/medea-jason-0.7.0/flutter + +See also [`medea-jason` crate 0.7.0 changes](/../../tree/medea-jason-0.7.0/CHANGELOG.md). + +### Upgraded + +- Dependencies: + - [`flutter_rust_bridge`] to 2.4.0 version. ([#188]) + +[#188]: /../../pull/188 + + + + ## [0.6.1] · 2024-09-11 [0.6.1]: /../../tree/medea-jason-0.6.1/flutter diff --git a/flutter/example/pubspec.lock b/flutter/example/pubspec.lock index e474fd11..2e529f40 100644 --- a/flutter/example/pubspec.lock +++ b/flutter/example/pubspec.lock @@ -191,10 +191,10 @@ packages: dependency: transitive description: name: flutter_rust_bridge - sha256: "7beb9cb4690916a6c4fd151d91dba53555ea258dbc029dd5f1bfba2e7bd32b86" + sha256: a43a6649385b853bc836ef2bc1b056c264d476c35e131d2d69c38219b5e799f1 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.0" flutter_test: dependency: "direct dev" description: flutter @@ -326,10 +326,10 @@ packages: dependency: "direct main" description: name: medea_flutter_webrtc - sha256: "08cdd70a90d277ffe7b08f3d75a8b333201ab532e07c7f8f2f6ccb8691fe355f" + sha256: "99cfe6cc919be56dd3a9747c514d8a4e77960c84287cc5ffb6d6ef28ebb56fbf" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.11.2-dev+rev.efd2c47e7017eee7c38acaeae8add307da42bd59" medea_jason: dependency: "direct main" description: @@ -530,10 +530,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.0.0" webdriver: dependency: transitive description: diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api.dart b/flutter/lib/src/native/ffi/frb/api/dart/api.dart index f439cefd..5c04f70d 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/connection_handle.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/connection_handle.dart index 4306b29e..fd8d2b85 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/connection_handle.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/connection_handle.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/jason.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/jason.dart index d89ea67f..2f9fb5a6 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/jason.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/jason.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/local_media_track.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/local_media_track.dart index 07d1c266..9afb2e72 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/local_media_track.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/local_media_track.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/media_manager.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/media_manager.dart index a57ecd56..b472c95e 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/media_manager.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/media_manager.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/reconnect_handle.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/reconnect_handle.dart index cc998e5f..ab2a8691 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/reconnect_handle.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/reconnect_handle.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/remote_media_track.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/remote_media_track.dart index 0ca40e25..6a455ebb 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/remote_media_track.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/remote_media_track.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/room.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/room.dart index bd3a2d86..7da28a8f 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/room.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/room.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/api/dart/api/room_close_reason.dart b/flutter/lib/src/native/ffi/frb/api/dart/api/room_close_reason.dart index 829eb80e..4bf02cfb 100644 --- a/flutter/lib/src/native/ffi/frb/api/dart/api/room_close_reason.dart +++ b/flutter/lib/src/native/ffi/frb/api/dart/api/room_close_reason.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/frb_generated.dart b/flutter/lib/src/native/ffi/frb/frb_generated.dart index 56a84930..73831bd4 100644 --- a/flutter/lib/src/native/ffi/frb/frb_generated.dart +++ b/flutter/lib/src/native/ffi/frb/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 @@ -46,6 +46,16 @@ class RustLib extends BaseEntrypoint { ); } + /// Initialize flutter_rust_bridge in mock mode. + /// No libraries for FFI are loaded. + static void initMock({ + required RustLibApi api, + }) { + instance.initMockImpl( + api: api, + ); + } + /// Dispose flutter_rust_bridge /// /// The call to this function is optional, since flutter_rust_bridge (and everything else) @@ -68,7 +78,7 @@ class RustLib extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.2.0'; + String get codegenVersion => '2.4.0'; @override int get rustContentHash => 223637457; @@ -2771,6 +2781,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return dcoDecodeI64(raw); } + @protected + PlatformInt64 dco_decode_isize(dynamic raw) { + // Codec=Dco (DartCObject based), see doc to use other codecs + return dcoDecodeI64(raw); + } + @protected List dco_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( @@ -3071,7 +3087,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @protected Object sse_decode_DartOpaque(SseDeserializer deserializer) { // Codec=Sse (Serialization based), see doc to use other codecs - // TODO: Modified by hand, must be fixed in frb codegen. var inner = sse_decode_isize(deserializer); return decodeDartOpaque(inner, generalizedFrbRustBinding); } @@ -3384,6 +3399,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return deserializer.buffer.getPlatformInt64(); } + @protected + PlatformInt64 sse_decode_isize(SseDeserializer deserializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + return deserializer.buffer.getPlatformInt64(); + } + @protected List sse_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( @@ -3606,13 +3627,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { return deserializer.buffer.getBigUint64(); } - // TODO: Modified by hand, must be fixed in frb codegen. - @protected - BigInt sse_decode_isize(SseDeserializer deserializer) { - // Codec=Sse (Serialization based), see doc to use other codecs - return deserializer.buffer.getBigInt64(); - } - @protected void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerConnectionHandle( @@ -3758,10 +3772,9 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { @protected void sse_encode_DartOpaque(Object self, SseSerializer serializer) { // Codec=Sse (Serialization based), see doc to use other codecs - sse_encode_usize( - BigInt.from(PlatformPointerUtil.ptrToInt(encodeDartOpaque( - self, portManager.dartHandlerPort, generalizedFrbRustBinding))) - .toUnsigned(64), + sse_encode_isize( + PlatformPointerUtil.ptrToPlatformInt64(encodeDartOpaque( + self, portManager.dartHandlerPort, generalizedFrbRustBinding)), serializer); } @@ -4042,6 +4055,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { serializer.buffer.putPlatformInt64(self); } + @protected + void sse_encode_isize(PlatformInt64 self, SseSerializer serializer) { + // Codec=Sse (Serialization based), see doc to use other codecs + serializer.buffer.putPlatformInt64(self); + } + @protected void sse_encode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( diff --git a/flutter/lib/src/native/ffi/frb/frb_generated.io.dart b/flutter/lib/src/native/ffi/frb/frb_generated.io.dart index 9aed7694..973a5cc1 100644 --- a/flutter/lib/src/native/ffi/frb/frb_generated.io.dart +++ b/flutter/lib/src/native/ffi/frb/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.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.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 @@ -250,6 +250,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 dco_decode_i_64(dynamic raw); + @protected + PlatformInt64 dco_decode_isize(dynamic raw); + @protected List dco_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( @@ -527,6 +530,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected PlatformInt64 sse_decode_i_64(SseDeserializer deserializer); + @protected + PlatformInt64 sse_decode_isize(SseDeserializer deserializer); + @protected List sse_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( @@ -606,10 +612,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected BigInt sse_decode_usize(SseDeserializer deserializer); - // TODO: Modified by hand, must be fixed in frb codegen. - @protected - BigInt sse_decode_isize(SseDeserializer deserializer); - @protected void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerConnectionHandle( @@ -809,6 +811,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl { @protected void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer); + @protected + void sse_encode_isize(PlatformInt64 self, SseSerializer serializer); + @protected void sse_encode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack( diff --git a/flutter/lib/src/native/ffi/frb/media.dart b/flutter/lib/src/native/ffi/frb/media.dart index 76506752..22a97bf3 100644 --- a/flutter/lib/src/native/ffi/frb/media.dart +++ b/flutter/lib/src/native/ffi/frb/media.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/media/constraints.dart b/flutter/lib/src/native/ffi/frb/media/constraints.dart index e47abeb3..c918cd7d 100644 --- a/flutter/lib/src/native/ffi/frb/media/constraints.dart +++ b/flutter/lib/src/native/ffi/frb/media/constraints.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/media/track.dart b/flutter/lib/src/native/ffi/frb/media/track.dart index 936e9652..4ce64ef3 100644 --- a/flutter/lib/src/native/ffi/frb/media/track.dart +++ b/flutter/lib/src/native/ffi/frb/media/track.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/lib/src/native/ffi/frb/media/track/remote.dart b/flutter/lib/src/native/ffi/frb/media/track/remote.dart index 964e27e8..09dabfff 100644 --- a/flutter/lib/src/native/ffi/frb/media/track/remote.dart +++ b/flutter/lib/src/native/ffi/frb/media/track/remote.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 202cf697..fa4168dc 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -11,11 +11,11 @@ dependencies: flutter: sdk: flutter ffi: ^2.0.2 - flutter_rust_bridge: 2.2.0 # should be the same as in `Cargo.lock` + flutter_rust_bridge: 2.4.0 # should be the same as in `Cargo.lock` freezed_annotation: ^2.4.4 http: ">=0.13.6 <2.0.0" json_annotation: ^4.9.0 - medea_flutter_webrtc: ^0.11.1 + medea_flutter_webrtc: ^0.11.2-dev+rev.efd2c47e7017eee7c38acaeae8add307da42bd59 retry: ^3.1.2 tuple: ^2.0.2 uuid: ^3.0.7 diff --git a/src/api/dart/api/api_bridge_generated.rs b/src/api/dart/api/api_bridge_generated.rs index 44ae670d..8009c1c2 100644 --- a/src/api/dart/api/api_bridge_generated.rs +++ b/src/api/dart/api/api_bridge_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// Generated by `flutter_rust_bridge`@ 2.2.0. +// @generated by `flutter_rust_bridge`@ 2.4.0. #![allow( non_camel_case_types, @@ -48,7 +48,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.2.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 223637457; // Section: executor @@ -2029,6 +2029,15 @@ impl SseDecode for i64 { } } +impl SseDecode for isize { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_decode( + deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer, + ) -> Self { + deserializer.cursor.read_i64::().unwrap() as _ + } +} + impl SseDecode for Vec { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode( @@ -3505,6 +3514,19 @@ impl SseEncode for i64 { } } +impl SseEncode for isize { + // Codec=Sse (Serialization based), see doc to use other codecs + fn sse_encode( + self, + serializer: &mut flutter_rust_bridge::for_generated::SseSerializer, + ) { + serializer + .cursor + .write_i64::(self as _) + .unwrap(); + } +} + impl SseEncode for Vec { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_encode( @@ -3830,7 +3852,7 @@ impl SseEncode for usize { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // Generated by `flutter_rust_bridge`@ 2.2.0. + // @generated by `flutter_rust_bridge`@ 2.4.0. // Section: imports