Skip to content

Commit dc942ab

Browse files
committed
Merge branch 'main' into duan/data-packet-cryptor
2 parents 2a36800 + 78e3f2e commit dc942ab

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
22

3+
## 2.5.1
4+
5+
* Fix Publication's track property initialization (#867)
6+
* Fix Missing attributes in data stream (#865)
7+
* Fix Internal WebRTC pod version conflict (#876)
8+
39
## 2.5.0+hotfix.3
410

511
* fix: Fix @internal conflicting imports from package meta or flutter/foundation.

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

lib/src/livekit.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import 'support/platform.dart' show lkPlatformIsMobile;
2020
/// Main entry point to connect to a room.
2121
/// {@category Room}
2222
class LiveKitClient {
23-
static const version = '2.5.0';
23+
static const version = '2.5.1';
2424

2525
/// Initialize the WebRTC plugin. If this is not manually called, will be
2626
/// initialized with default settings.

pubspec.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ packages:
8585
dependency: transitive
8686
description:
8787
name: code_builder
88-
sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
88+
sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "4.10.1"
91+
version: "4.11.0"
9292
collection:
9393
dependency: "direct main"
9494
description:
@@ -141,10 +141,10 @@ packages:
141141
dependency: "direct main"
142142
description:
143143
name: dart_webrtc
144-
sha256: "3bfa069a8b14a53ba506f6dd529e9b88c878ba0cc238f311051a39bf1e53d075"
144+
sha256: "51bcda4ba5d7dd9e65a309244ce3ac0b58025e6e1f6d7442cee4cd02134ef65f"
145145
url: "https://pub.dev"
146146
source: hosted
147-
version: "1.5.3+hotfix.5"
147+
version: "1.6.0"
148148
dbus:
149149
dependency: transitive
150150
description:
@@ -220,10 +220,10 @@ packages:
220220
dependency: "direct main"
221221
description:
222222
name: flutter_webrtc
223-
sha256: "945d0a38b90fbca8257eadb167d8fb9fa7075d9a1939fd2953c10054454d1de2"
223+
sha256: "16ca9e30d428bae3dd32933e875c9f67c5843d1fa726c37cf1fc479eb9294549"
224224
url: "https://pub.dev"
225225
source: hosted
226-
version: "1.1.0"
226+
version: "1.2.0"
227227
glob:
228228
dependency: transitive
229229
description:
@@ -268,10 +268,10 @@ packages:
268268
dependency: transitive
269269
description:
270270
name: leak_tracker
271-
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
271+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
272272
url: "https://pub.dev"
273273
source: hosted
274-
version: "11.0.1"
274+
version: "11.0.2"
275275
leak_tracker_flutter_testing:
276276
dependency: transitive
277277
description:
@@ -609,10 +609,10 @@ packages:
609609
dependency: transitive
610610
description:
611611
name: webrtc_interface
612-
sha256: "86fe3afc81a08481dfb25cf14a5a94e27062ecef25544783f352c914e0bbc1ca"
612+
sha256: "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233"
613613
url: "https://pub.dev"
614614
source: hosted
615-
version: "1.2.2+hotfix.2"
615+
version: "1.3.0"
616616
win32:
617617
dependency: transitive
618618
description:

pubspec.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
name: livekit_client
1616
description: Flutter Client SDK for LiveKit.
1717
Build real-time video and audio into your apps. Supports iOS, Android, and Web.
18-
version: 2.5.0+hotfix.3
18+
version: 2.5.1
1919
homepage: https://github.com/livekit/client-sdk-flutter
2020

2121
environment:
@@ -45,6 +45,10 @@ dependencies:
4545
mime_type: ^1.0.1
4646
path: ^1.9.1
4747

48+
# Fix version to avoid version conflicts between WebRTC-SDK pods, which both this package and flutter_webrtc depend on.
49+
flutter_webrtc: 1.2.0
50+
dart_webrtc: ^1.6.0
51+
4852
dev_dependencies:
4953
flutter_test:
5054
sdk: flutter
@@ -76,11 +80,9 @@ flutter:
7680
pluginClass: LiveKitWebPlugin
7781
fileName: livekit_client_web.dart
7882

79-
8083
topics:
8184
- webrtc
8285
- voip
8386
- video
8487
- livestream
8588
- conference
86-

0 commit comments

Comments
 (0)