From a57001c09cda4eae4c0c4918690208c6b41d2f7b Mon Sep 17 00:00:00 2001 From: Remon Date: Mon, 11 May 2020 07:59:36 +0200 Subject: [PATCH 1/2] upgrade latest dependencies from pub dev --- example/pubspec.lock | 23 ++++++---- example/pubspec.yaml | 2 +- lib/src/model/discovered_device.g.dart | 8 +++- pubspec.lock | 63 ++++++++++++++------------ pubspec.yaml | 10 ++-- 5 files changed, 63 insertions(+), 43 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 116570c9..756e1ffd 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -63,7 +63,7 @@ packages: name: dependency_validator url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.5.0" fixnum: dependency: transitive description: @@ -94,7 +94,7 @@ packages: name: functional_data url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "0.3.0" image: dependency: transitive description: @@ -108,7 +108,7 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+2" + version: "0.11.4" matcher: dependency: transitive description: @@ -151,6 +151,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.4.0" + plain_optional: + dependency: transitive + description: + name: plain_optional + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" protobuf: dependency: transitive description: @@ -164,14 +171,14 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "4.0.4" + version: "4.1.1" pub_semver: dependency: transitive description: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.4.4" quiver: dependency: transitive description: @@ -253,7 +260,7 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.2.1" sdks: - dart: ">=2.6.0 <3.0.0" - flutter: ">=1.12.1" + dart: ">=2.7.0 <3.0.0" + flutter: ">=1.17.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 7980157a..b8aaabea 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.1.0 publish_to: 'none' environment: - sdk: ">=2.3.0 <3.0.0" + sdk: ">=2.7.0 <3.0.0" flutter: ">=1.10.0" dependencies: diff --git a/lib/src/model/discovered_device.g.dart b/lib/src/model/discovered_device.g.dart index 89dbb91e..38ff27d0 100644 --- a/lib/src/model/discovered_device.g.dart +++ b/lib/src/model/discovered_device.g.dart @@ -6,13 +6,17 @@ part of 'discovered_device.dart'; // FunctionalDataGenerator // ************************************************************************** +// ignore_for_file: join_return_with_assignment +// ignore_for_file: avoid_classes_with_only_static_members +// ignore_for_file: non_constant_identifier_names +// ignore_for_file: avoid_equals_and_hash_code_on_mutable_classes abstract class $DiscoveredDevice { + const $DiscoveredDevice(); String get id; String get name; Map get serviceData; Uint8List get manufacturerData; int get rssi; - const $DiscoveredDevice(); DiscoveredDevice copyWith( {String id, String name, @@ -25,8 +29,10 @@ abstract class $DiscoveredDevice { serviceData: serviceData ?? this.serviceData, manufacturerData: manufacturerData ?? this.manufacturerData, rssi: rssi ?? this.rssi); + @override String toString() => "DiscoveredDevice(id: $id, name: $name, serviceData: $serviceData, manufacturerData: $manufacturerData, rssi: $rssi)"; + @override bool operator ==(dynamic other) => other.runtimeType == runtimeType && id == other.id && diff --git a/pubspec.lock b/pubspec.lock index a041107c..a55e07bd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.36.4" + version: "0.38.5" archive: dependency: transitive description: @@ -49,14 +49,14 @@ packages: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.1+1" + version: "0.4.2" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.4" build_resolvers: dependency: transitive description: @@ -70,28 +70,28 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "1.9.0" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "5.1.0" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.3.2" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.1.0" charcode: dependency: transitive description: @@ -147,14 +147,14 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.2.9" + version: "1.3.3" dependency_validator: dependency: "direct dev" description: name: dependency_validator url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.5.0" fixnum: dependency: transitive description: @@ -178,21 +178,21 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.19" + version: "0.1.27" functional_data: dependency: "direct main" description: name: functional_data url: "https://pub.dartlang.org" source: hosted - version: "0.2.3" + version: "0.3.0" functional_data_generator: dependency: "direct dev" description: name: functional_data_generator url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.3.3" glob: dependency: transitive description: @@ -220,21 +220,21 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.0+2" + version: "0.12.1" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "3.1.4" image: dependency: transitive description: @@ -248,7 +248,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.3" + version: "0.3.4" js: dependency: transitive description: @@ -262,21 +262,21 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" kernel: dependency: transitive description: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.19" + version: "0.3.27" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.3+2" + version: "0.11.4" matcher: dependency: transitive description: @@ -318,14 +318,14 @@ packages: name: node_io url: "https://pub.dartlang.org" source: hosted - version: "1.0.1+2" + version: "1.1.0" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.9.3" package_resolver: dependency: transitive description: @@ -346,7 +346,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.8.0+1" + version: "1.9.0" petitparser: dependency: transitive description: @@ -354,6 +354,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.4.0" + plain_optional: + dependency: transitive + description: + name: plain_optional + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" pool: dependency: transitive description: @@ -374,7 +381,7 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.4.4" pubspec_parse: dependency: transitive description: @@ -414,7 +421,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "0.9.4+4" + version: "0.9.4+6" source_span: dependency: transitive description: @@ -442,7 +449,7 @@ packages: name: stream_transform url: "https://pub.dartlang.org" source: hosted - version: "0.0.20" + version: "1.2.0" string_scanner: dependency: transitive description: @@ -491,7 +498,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+13" + version: "0.9.7+15" web_socket_channel: dependency: transitive description: @@ -512,7 +519,7 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.2.1" sdks: - dart: ">=2.6.0 <3.0.0" + dart: ">=2.7.0 <3.0.0" flutter: ">=1.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index b6c36205..eea768de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,24 +4,24 @@ version: 2.1.0 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: - sdk: ">=2.3.0 <3.0.0" + sdk: ">=2.7.0 <3.0.0" flutter: ">=1.10.0" dependencies: flutter: sdk: flutter - functional_data: ^0.2.3 + functional_data: ^0.3.0 protobuf: ^1.0.1 meta: ^1.1.8 - collection: ^1.14.11 + collection: ^1.14.12 dev_dependencies: flutter_test: sdk: flutter - build_runner: ^1.7.2 + build_runner: ^1.9.0 mockito: ^4.1.1 dependency_validator: ^1.4.2 - functional_data_generator: ^0.2.3 + functional_data_generator: ^0.3.0 flutter: plugin: From d9b679a2b85d603060b922576ed453f3763ca18e Mon Sep 17 00:00:00 2001 From: Remon Date: Mon, 11 May 2020 08:02:26 +0200 Subject: [PATCH 2/2] prepare version 2.2.0 --- CHANGELOG.md | 4 ++++ example/pubspec.lock | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f40d86a..e2ab35d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.0 +* Upgrade dependencies +* Bump min Dart sdk version to 2.7 + ## 2.1.0 * Improve documentation of public API * Fix for write without response on iOS diff --git a/example/pubspec.lock b/example/pubspec.lock index 756e1ffd..be34be43 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -82,7 +82,7 @@ packages: path: ".." relative: true source: path - version: "2.1.0" + version: "2.2.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/example/pubspec.yaml b/example/pubspec.yaml index b8aaabea..c4204ccb 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_reactive_ble_example description: Demonstrates how to use the flutter_reactive_ble plugin. -version: 2.1.0 +version: 2.2.0 publish_to: 'none' environment: diff --git a/pubspec.yaml b/pubspec.yaml index eea768de..6cf17d42 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_reactive_ble description: Reactive Bluetooth low energy (BLE) plugin that can communicate with multiple devices -version: 2.1.0 +version: 2.2.0 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: