Skip to content

Commit 63aeb79

Browse files
committed
fix @internal conflicting imports.
1 parent c8fa197 commit 63aeb79

File tree

10 files changed

+28
-15
lines changed

10 files changed

+28
-15
lines changed

CHANGELOG.md

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

3+
## 2.5.0+hotfix.3
4+
5+
* fix: Fix @internal conflicting imports from package meta or flutter/foundation.
6+
37
## 2.5.0+hotfix.2
48

59
* hotfix: bump libwebrtc to m137.7151.03 to support H.265 (#837)

lib/src/core/engine.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616

1717
import 'dart:async';
1818

19-
import 'package:flutter/foundation.dart';
19+
import 'package:flutter/foundation.dart' hide internal;
2020

2121
import 'package:collection/collection.dart';
2222
import 'package:connectivity_plus/connectivity_plus.dart';
2323
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
24+
import 'package:meta/meta.dart';
2425

2526
import '../events.dart';
2627
import '../exceptions.dart';

lib/src/core/room.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:flutter/foundation.dart';
17+
import 'package:flutter/foundation.dart' hide internal;
1818

1919
import 'package:collection/collection.dart';
2020
import 'package:http/http.dart' as http;
21+
import 'package:meta/meta.dart';
2122

2223
import '../core/signal_client.dart';
2324
import '../data_stream/stream_reader.dart';
@@ -1101,17 +1102,17 @@ extension RoomHardwareManagementMethods on Room {
11011102
final currentDeviceId =
11021103
engine.roomOptions.defaultCameraCaptureOptions.deviceId;
11031104

1105+
// Always update roomOptions so future tracks use the correct device
1106+
engine.roomOptions = engine.roomOptions.copyWith(
1107+
defaultCameraCaptureOptions: roomOptions.defaultCameraCaptureOptions
1108+
.copyWith(deviceId: device.deviceId),
1109+
);
1110+
11041111
try {
11051112
if (track != null && selectedVideoInputDeviceId != device.deviceId) {
11061113
await track.switchCamera(device.deviceId);
11071114
Hardware.instance.selectedVideoInput = device;
11081115
}
1109-
1110-
// Always update roomOptions so future tracks use the correct device
1111-
engine.roomOptions = engine.roomOptions.copyWith(
1112-
defaultCameraCaptureOptions: roomOptions.defaultCameraCaptureOptions
1113-
.copyWith(deviceId: device.deviceId),
1114-
);
11151116
} catch (e) {
11161117
// if the switching actually fails, reset it to the previous deviceId
11171118
engine.roomOptions = engine.roomOptions.copyWith(

lib/src/core/signal_client.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
import 'dart:async';
1616
import 'dart:collection';
1717

18-
import 'package:flutter/foundation.dart';
18+
import 'package:flutter/foundation.dart' hide internal;
1919

2020
import 'package:connectivity_plus/connectivity_plus.dart';
2121
import 'package:fixnum/fixnum.dart';
2222
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
2323
import 'package:http/http.dart' as http;
24+
import 'package:meta/meta.dart';
2425

2526
import '../events.dart';
2627
import '../exceptions.dart';

lib/src/managers/broadcast_manager.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import 'package:flutter/foundation.dart';
15+
import 'package:flutter/foundation.dart' hide internal;
16+
17+
import 'package:meta/meta.dart';
1618

1719
import '../support/native.dart';
1820

lib/src/participant/local.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import 'dart:async';
1818
import 'dart:io';
1919
import 'dart:math';
2020

21-
import 'package:flutter/foundation.dart';
21+
import 'package:flutter/foundation.dart' hide internal;
2222

2323
import 'package:async/async.dart';
2424
import 'package:fixnum/fixnum.dart';
2525
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
26+
import 'package:meta/meta.dart';
2627
import 'package:mime_type/mime_type.dart';
2728
import 'package:path/path.dart';
2829
import 'package:uuid/uuid.dart';

lib/src/track/local/local.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:flutter/foundation.dart';
17+
import 'package:flutter/foundation.dart' hide internal;
1818
import 'package:flutter/material.dart';
1919

2020
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
21+
import 'package:meta/meta.dart';
2122

2223
import '../../events.dart';
2324
import '../../exceptions.dart';

lib/src/track/track.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:flutter/foundation.dart';
17+
import 'package:flutter/foundation.dart' hide internal;
1818

1919
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
20+
import 'package:meta/meta.dart';
2021
import 'package:uuid/uuid.dart';
2122

2223
import '../events.dart';

lib/src/utils.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ import 'dart:async';
1616
import 'dart:convert';
1717
import 'dart:math' as math;
1818

19-
import 'package:flutter/foundation.dart';
19+
import 'package:flutter/foundation.dart' hide internal;
2020

2121
import 'package:collection/collection.dart';
2222
import 'package:connectivity_plus/connectivity_plus.dart';
2323
import 'package:device_info_plus/device_info_plus.dart';
2424
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
25+
import 'package:meta/meta.dart';
2526

2627
import './proto/livekit_models.pb.dart' as lk_models;
2728
import './support/native.dart';

pubspec.yaml

Lines changed: 1 addition & 1 deletion
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.2
18+
version: 2.5.0+hotfix.3
1919
homepage: https://github.com/livekit/client-sdk-flutter
2020

2121
environment:

0 commit comments

Comments
 (0)