Upgrade flutter_rust_bridge to 2.4.0 version (#188)

instrumentisto · Sep 20, 2024 · 3da0381 · 3da0381
1 parent 39d7a12
commit 3da0381
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 49 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<RustLibApi, RustLibApiImpl, RustLibWire> {
  );
  }
 
+ /// 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<RustLibApi, RustLibApiImpl, RustLibWire> {
  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<LocalMediaTrack>
  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<LocalMediaTrack>
  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
@@ -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<RustLibWire> {
  @protected
  PlatformInt64 dco_decode_i_64(dynamic raw);
 
+ @protected
+ PlatformInt64 dco_decode_isize(dynamic raw);
+
  @protected
  List<LocalMediaTrack>
  dco_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack(
@@ -527,6 +530,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @protected
  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer);
 
+ @protected
+ PlatformInt64 sse_decode_isize(SseDeserializer deserializer);
+
  @protected
  List<LocalMediaTrack>
  sse_decode_list_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerLocalMediaTrack(
@@ -606,10 +612,6 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
  @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<RustLibWire> {
  @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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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