diff --git a/dart_ping/lib/src/native_ping.dart b/dart_ping/lib/src/native_ping.dart index 4dd3241..451d814 100644 --- a/dart_ping/lib/src/native_ping.dart +++ b/dart_ping/lib/src/native_ping.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'dart:io'; -import 'package:dart_ping/src/ping_interface.dart'; import 'package:dart_ping/src/models/ping_parser.dart'; import 'package:dart_ping/src/ping/linux_ping.dart'; import 'package:dart_ping/src/ping/mac_ping.dart'; import 'package:dart_ping/src/ping/windows_ping.dart'; +import 'package:dart_ping/src/ping_interface.dart'; // ignore: long-parameter-list Ping getPing( diff --git a/dart_ping/lib/src/ping/base_ping.dart b/dart_ping/lib/src/ping/base_ping.dart index ceab67f..98dd846 100644 --- a/dart_ping/lib/src/ping/base_ping.dart +++ b/dart_ping/lib/src/ping/base_ping.dart @@ -5,8 +5,8 @@ import 'dart:io'; import 'package:async/async.dart'; import 'package:dart_ping/src/models/ping_data.dart'; import 'package:dart_ping/src/models/ping_error.dart'; -import 'package:dart_ping/src/models/ping_summary.dart'; import 'package:dart_ping/src/models/ping_parser.dart'; +import 'package:dart_ping/src/models/ping_summary.dart'; abstract class BasePing { BasePing( @@ -75,8 +75,10 @@ abstract class BasePing { ); /// Transforms the ping process output into PingData objects - Stream get _parsedOutput => - StreamGroup.merge([_process!.stderr, _process!.stdout]) + Stream get _parsedOutput => StreamGroup.merge([ + _process!.stderr, + _process!.stdout, + ]) .transform(encoding.decoder) .transform(LineSplitter()) .transform(parser.responseParser); @@ -84,6 +86,7 @@ abstract class BasePing { Future _onListen() async { // Start new ping process on host OS _process = await platformProcess; + // Get platform-specific parsed PingData _sub = _parsedOutput.listen( (event) { diff --git a/dart_ping/pubspec.yaml b/dart_ping/pubspec.yaml index 99d58f4..4b174a0 100644 --- a/dart_ping/pubspec.yaml +++ b/dart_ping/pubspec.yaml @@ -8,10 +8,10 @@ environment: sdk: ">=2.17.0 <3.0.0" dependencies: - async: ^2.4.2 - collection: ^1.16.0 + async: ^2.10.0 + collection: ^1.17.0 dev_dependencies: - dart_code_metrics: ^5.4.0 - lints: ^2.0.0 - test: ^1.14.4 + dart_code_metrics: ^5.5.0 + lints: ^2.0.1 + test: ^1.22.2 diff --git a/dart_ping_ios/.flutter-plugins b/dart_ping_ios/.flutter-plugins index f426d6b..fc20575 100644 --- a/dart_ping_ios/.flutter-plugins +++ b/dart_ping_ios/.flutter-plugins @@ -1,2 +1,2 @@ # This is a generated file; do not edit or check into version control. -flutter_icmp_ping=/Users/andrew/.pub-cache/hosted/pub.dartlang.org/flutter_icmp_ping-3.1.1/ +flutter_icmp_ping=/Users/andrew/.pub-cache/hosted/pub.dartlang.org/flutter_icmp_ping-3.1.2/ diff --git a/dart_ping_ios/example/pubspec.yaml b/dart_ping_ios/example/pubspec.yaml index dbdba34..c7ae634 100644 --- a/dart_ping_ios/example/pubspec.yaml +++ b/dart_ping_ios/example/pubspec.yaml @@ -23,13 +23,13 @@ environment: dependencies: flutter: sdk: flutter - dart_ping: ^7.0.0 + dart_ping: ^8.0.1 dart_ping_ios: path: ../ # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 + cupertino_icons: ^1.0.5 dev_dependencies: flutter_test: diff --git a/dart_ping_ios/pubspec.yaml b/dart_ping_ios/pubspec.yaml index 5c85f86..e5d81f7 100644 --- a/dart_ping_ios/pubspec.yaml +++ b/dart_ping_ios/pubspec.yaml @@ -8,10 +8,10 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: - dart_ping: ^7.0.0 - flutter_icmp_ping: ^3.1.0 + dart_ping: ^8.0.1 + flutter_icmp_ping: ^3.1.2 dev_dependencies: - dart_code_metrics: ^4.8.1 + dart_code_metrics: ^5.4.0 flutter_lints: ^2.0.1 - test: ^1.14.4 + test: ^1.22.2