Skip to content

Commit 82a8909

Browse files
authored
Upgrade flutter_rust_bridge to 2.11.1 version (#237)
Additionally: - fix exception in `PeerObserver::onTrack` - upgrade `freezed` and `freezed_annotation` pub packages to 3.1.0 version - upgrade `ffigen` pub package to 19.0.0 version
1 parent 08282de commit 82a8909

File tree

68 files changed

+4167
-11323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4167
-11323
lines changed

CHANGELOG.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,19 @@ All user visible changes to this project will be documented in this file. This p
1212

1313
### Changed
1414

15-
- Upgraded [libwebrtc] to [138.0.7204.100] version. ([#233], [todo])
15+
- Upgraded [libwebrtc] to [138.0.7204.100] version. ([#233], [a8382e48])
16+
- Upgraded [`flutter_rust_bridge`] crate to [2.11.1][frb-2.11.1] version. ([#237])
17+
18+
### Fixed
19+
20+
- [Android]:
21+
- Unhandled exception due to race when new remote track is discovered. ([#237])
1622

1723
[#233]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/233
18-
[todo]: https://github.com/instrumentisto/medea-flutter-webrtc/commit/todo
24+
[#237]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/237
25+
[a8382e48]: https://github.com/instrumentisto/medea-flutter-webrtc/commit/a8382e482550892d262c5bd00d3a29898a739777
1926
[138.0.7204.100]: https://github.com/instrumentisto/libwebrtc-bin/releases/tag/138.0.7204.100
27+
[frb-2.11.1]: https://github.com/fzyzcjy/flutter_rust_bridge/releases/tag/v2.11.1
2028

2129

2230

@@ -32,7 +40,7 @@ All user visible changes to this project will be documented in this file. This p
3240

3341
### Added
3442

35-
- `setupForegroundService()` function for maintaining camera/microphone/audio when application is in background on Android. ([#204])
43+
- `setupForegroundService()` function for maintaining camera/microphone/audio when application is in background on [Android]. ([#204])
3644

3745
### Changed
3846

@@ -41,7 +49,7 @@ All user visible changes to this project will be documented in this file. This p
4149

4250
### Fixed
4351

44-
- Resources cleanup when `medea_flutter_webrtc` Flutter plugin is detached on Android. ([#202])
52+
- Resources cleanup when `medea_flutter_webrtc` Flutter plugin is detached on [Android]. ([#202])
4553

4654
[#201]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/201
4755
[#202]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/202

Cargo.lock

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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ endif
305305
--no-add-mod-to-lib \
306306
--dart-output=lib/src/api/bridge \
307307
--no-web
308-
flutter pub run build_runner build --delete-conflicting-outputs
308+
dart run build_runner build --delete-conflicting-outputs
309309

310310

311311
# Lint Rust sources with Clippy.

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group = "com.instrumentisto.medea_flutter_webrtc"
2-
version = "0.15.0"
2+
version = "0.15.1-dev"
33

44
buildscript {
55
ext.kotlin_version = "1.8.22"

android/src/main/kotlin/com/instrumentisto/medea_flutter_webrtc/proxy/MediaStreamTrackProxy.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ class MediaStreamTrackProxy(
8989
}
9090
(obj as VideoTrack).addSink(sink)
9191

92-
addOnSyncListener { (obj as VideoTrack).addSink(sink) }
92+
addOnSyncListener {
93+
if (sink != null) {
94+
(obj as VideoTrack).addSink(sink)
95+
}
96+
}
9397
}
9498
}
9599

crates/native/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ anyhow = "1.0"
1212
cxx = "1.0"
1313
dashmap = "6.1"
1414
derive_more = { version = "2.0", features = ["as_ref", "display", "from", "into"] }
15-
flutter_rust_bridge = { version = "=2.10.0", features = ["anyhow", "dart-opaque", "rust-async", "thread-pool"], default-features = false }
15+
flutter_rust_bridge = { version = "=2.11.1", features = ["anyhow", "dart-opaque", "rust-async", "thread-pool"], default-features = false }
1616
libwebrtc-sys = { path = "../libwebrtc-sys" }
1717
log = "0.4"
1818
threadpool = "1.8"

crates/native/src/frb_generated.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is automatically generated, so please do not edit it.
2-
// @generated by `flutter_rust_bridge`@ 2.10.0.
2+
// @generated by `flutter_rust_bridge`@ 2.11.1.
33

44
#![allow(
55
non_camel_case_types,
@@ -41,7 +41,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
4141
default_rust_opaque = RustOpaqueMoi,
4242
default_rust_auto_opaque = RustAutoOpaqueMoi,
4343
);
44-
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.10.0";
44+
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.11.1";
4545
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1851697459;
4646

4747
// Section: executor
@@ -5754,7 +5754,7 @@ impl SseEncode for crate::api::media::constraints::video::VideoConstraints {
57545754
#[cfg(not(target_family = "wasm"))]
57555755
mod io {
57565756
// This file is automatically generated, so please do not edit it.
5757-
// @generated by `flutter_rust_bridge`@ 2.10.0.
5757+
// @generated by `flutter_rust_bridge`@ 2.11.1.
57585758

57595759
// Section: imports
57605760

example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PODS:
33
- instrumentisto-libwebrtc-bin (138.0.7204.100)
44
- integration_test (0.0.1):
55
- Flutter
6-
- medea_flutter_webrtc (0.15.0):
6+
- medea_flutter_webrtc (0.15.1-dev):
77
- Flutter
88
- instrumentisto-libwebrtc-bin (= 138.0.7204.100)
99

@@ -28,7 +28,7 @@ SPEC CHECKSUMS:
2828
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
2929
instrumentisto-libwebrtc-bin: 522036a664b313c1102578ed9489f9fcff3be1b4
3030
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
31-
medea_flutter_webrtc: 8c1b68a826dbc3a76876a8a81d2b85ded3db9be8
31+
medea_flutter_webrtc: 937c2b908cacbcfc3deec9b4c7ab743e232ca0ea
3232

3333
PODFILE CHECKSUM: 1dbc3cbd33fc238907ad8f1ddbe5de6cf2d9c193
3434

example/macos/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
22
- FlutterMacOS (1.0.0)
3-
- medea_flutter_webrtc (0.15.0):
3+
- medea_flutter_webrtc (0.15.1-dev):
44
- FlutterMacOS
55

66
DEPENDENCIES:
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
1515

1616
SPEC CHECKSUMS:
1717
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
18-
medea_flutter_webrtc: 760c9f63df8d7cd6a85b478d7e7c490073e1a12e
18+
medea_flutter_webrtc: 2ed92b5f337d7f6ba0e2b1b72f1172fc5e04e45f
1919

2020
PODFILE CHECKSUM: 1b29b575031b812e1e7a7cf698aec84e8b2cab1e
2121

example/pubspec.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
8+
sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "82.0.0"
11+
version: "85.0.0"
1212
analyzer:
1313
dependency: transitive
1414
description:
1515
name: analyzer
16-
sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
16+
sha256: "754aed101003afceca3e6637fe88150dbe9739068e0135788a62645a131867bb"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "7.4.5"
19+
version: "7.5.9"
2020
args:
2121
dependency: transitive
2222
description:
@@ -45,10 +45,10 @@ packages:
4545
dependency: transitive
4646
description:
4747
name: build
48-
sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
48+
sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7"
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "2.4.2"
51+
version: "2.5.4"
5252
build_cli_annotations:
5353
dependency: transitive
5454
description:
@@ -77,26 +77,26 @@ packages:
7777
dependency: transitive
7878
description:
7979
name: build_resolvers
80-
sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
80+
sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62
8181
url: "https://pub.dev"
8282
source: hosted
83-
version: "2.4.4"
83+
version: "2.5.4"
8484
build_runner:
8585
dependency: "direct dev"
8686
description:
8787
name: build_runner
88-
sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
88+
sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53"
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "2.4.15"
91+
version: "2.5.4"
9292
build_runner_core:
9393
dependency: transitive
9494
description:
9595
name: build_runner_core
96-
sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
96+
sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792"
9797
url: "https://pub.dev"
9898
source: hosted
99-
version: "8.0.0"
99+
version: "9.1.2"
100100
built_collection:
101101
dependency: transitive
102102
description:
@@ -109,10 +109,10 @@ packages:
109109
dependency: transitive
110110
description:
111111
name: built_value
112-
sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4
112+
sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "8.9.5"
115+
version: "8.10.1"
116116
characters:
117117
dependency: transitive
118118
description:
@@ -125,10 +125,10 @@ packages:
125125
dependency: transitive
126126
description:
127127
name: checked_yaml
128-
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
128+
sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
129129
url: "https://pub.dev"
130130
source: hosted
131-
version: "2.0.3"
131+
version: "2.0.4"
132132
clock:
133133
dependency: transitive
134134
description:
@@ -239,10 +239,10 @@ packages:
239239
dependency: transitive
240240
description:
241241
name: flutter_rust_bridge
242-
sha256: b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb
242+
sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e"
243243
url: "https://pub.dev"
244244
source: hosted
245-
version: "2.10.0"
245+
version: "2.11.1"
246246
flutter_test:
247247
dependency: "direct dev"
248248
description: flutter
@@ -252,10 +252,10 @@ packages:
252252
dependency: transitive
253253
description:
254254
name: freezed_annotation
255-
sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
255+
sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
256256
url: "https://pub.dev"
257257
source: hosted
258-
version: "2.4.4"
258+
version: "3.1.0"
259259
frontend_server_client:
260260
dependency: transitive
261261
description:
@@ -400,7 +400,7 @@ packages:
400400
path: ".."
401401
relative: true
402402
source: path
403-
version: "0.15.0"
403+
version: "0.15.1-dev"
404404
meta:
405405
dependency: transitive
406406
description:
@@ -610,10 +610,10 @@ packages:
610610
dependency: transitive
611611
description:
612612
name: watcher
613-
sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
613+
sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
614614
url: "https://pub.dev"
615615
source: hosted
616-
version: "1.1.1"
616+
version: "1.1.2"
617617
web:
618618
dependency: transitive
619619
description:

0 commit comments

Comments
 (0)