From 435670d4fae240c81b647334e08e2763b31b14f0 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Thu, 6 Jul 2023 10:42:28 -0400 Subject: [PATCH] Dart3 (#58) --- example/viam_example_app/pubspec.yaml | 6 ++++-- lib/src/components/movement_sensor/client.dart | 3 --- lib/src/media/stream/client.dart | 1 + lib/src/widgets/widgets.dart | 2 +- pubspec.yaml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/viam_example_app/pubspec.yaml b/example/viam_example_app/pubspec.yaml index 733f2c30d7..16b2752714 100644 --- a/example/viam_example_app/pubspec.yaml +++ b/example/viam_example_app/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: '>=2.19.5 <4.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: flutter: @@ -14,6 +14,8 @@ dependencies: path: ../../ cupertino_icons: ^1.0.2 flutter_platform_widgets: ^3.2.1 + flutter_webrtc: ^0.9.35 + image: ^4.0.17 dev_dependencies: flutter_launcher_icons: ^0.13.1 @@ -40,4 +42,4 @@ flutter_launcher_icons: icon_size: 48 # min:48, max:256, default: 48 macos: generate: true - image_path: "assets/icon/app_logo.png" \ No newline at end of file + image_path: "assets/icon/app_logo.png" diff --git a/lib/src/components/movement_sensor/client.dart b/lib/src/components/movement_sensor/client.dart index 8cfb086c43..ff295339b3 100644 --- a/lib/src/components/movement_sensor/client.dart +++ b/lib/src/components/movement_sensor/client.dart @@ -1,5 +1,4 @@ import 'package:grpc/grpc_connection_interface.dart'; -import 'package:logger/logger.dart'; import '../../gen/common/v1/common.pb.dart'; import '../../gen/component/movementsensor/v1/movementsensor.pbgrpc.dart'; @@ -7,8 +6,6 @@ import '../../resource/base.dart'; import '../../utils.dart'; import 'movement_sensor.dart'; -Logger _logger = Logger(); - /// gRPC client for the [MovementSensor] component. class MovementSensorClient extends MovementSensor implements ResourceRPCClient { @override diff --git a/lib/src/media/stream/client.dart b/lib/src/media/stream/client.dart index 18ec7c46d1..937c48db74 100644 --- a/lib/src/media/stream/client.dart +++ b/lib/src/media/stream/client.dart @@ -10,6 +10,7 @@ class StreamManager { final Map _clients = {}; final WebRtcClientChannel _channel; final StreamServiceClient _client; + // ignore: cancel_subscriptions StreamSubscription? _errorHandler; static final Finalizer _finalizer = Finalizer((p0) { diff --git a/lib/src/widgets/widgets.dart b/lib/src/widgets/widgets.dart index e68ef8bf32..55de8ce948 100644 --- a/lib/src/widgets/widgets.dart +++ b/lib/src/widgets/widgets.dart @@ -84,7 +84,7 @@ class _BaseJoystickState extends State { ); } - void callSetPower(details) { + void callSetPower(StickDragDetails details) { widget.base.setPower( Vector3(y: details.y * -1), Vector3(z: details.x * -1), diff --git a/pubspec.yaml b/pubspec.yaml index e70ab8624f..8044fb96a9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: https://viam.com environment: - sdk: '>=2.19.0 <3.0.0' + sdk: '>=3.0.0 <4.0.0' flutter: ">=3.0.0" dependencies: @@ -12,10 +12,10 @@ dependencies: sdk: flutter auth0_flutter: ^1.1.0 collection: ^1.16.0 - fimber_io: ^0.6.6 + fimber_io: ^0.7.0 flutter_webrtc: ^0.9.26 grpc: ^3.1.0 - protobuf: ^2.1.0 + protobuf: ^3.0.0 image: ^4.0.16 logger: ^1.3.0 fixnum: ^1.1.0