From b3330d63c64d4d883e171c2fdf1b76fddc2ebe55 Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 14:54:40 +0200 Subject: [PATCH 1/9] update dependencies for platform interface --- .../src/model/connection_state_update.g.dart | 73 ++++++++--- .../lib/src/model/discovered_device.g.dart | 115 ++++++++++++++---- .../lib/src/model/discovered_service.g.dart | 80 +++++++++--- .../pubspec.lock | 77 ++++++------ .../pubspec.yaml | 8 +- 5 files changed, 252 insertions(+), 101 deletions(-) diff --git a/packages/reactive_ble_platform_interface/lib/src/model/connection_state_update.g.dart b/packages/reactive_ble_platform_interface/lib/src/model/connection_state_update.g.dart index c4237253..779203c3 100644 --- a/packages/reactive_ble_platform_interface/lib/src/model/connection_state_update.g.dart +++ b/packages/reactive_ble_platform_interface/lib/src/model/connection_state_update.g.dart @@ -6,34 +6,54 @@ part of 'connection_state_update.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 $ConnectionStateUpdate { const $ConnectionStateUpdate(); + String get deviceId; DeviceConnectionState get connectionState; GenericFailure? get failure; - ConnectionStateUpdate copyWith( - {String? deviceId, - DeviceConnectionState? connectionState, - GenericFailure? failure}) => + + ConnectionStateUpdate copyWith({ + String? deviceId, + DeviceConnectionState? connectionState, + GenericFailure? failure, + }) => ConnectionStateUpdate( - deviceId: deviceId ?? this.deviceId, - connectionState: connectionState ?? this.connectionState, - failure: failure ?? this.failure); + deviceId: deviceId ?? this.deviceId, + connectionState: connectionState ?? this.connectionState, + failure: failure ?? this.failure, + ); + + ConnectionStateUpdate copyUsing( + void Function(ConnectionStateUpdate$Change change) mutator) { + final change = ConnectionStateUpdate$Change._( + this.deviceId, + this.connectionState, + this.failure, + ); + mutator(change); + return ConnectionStateUpdate( + deviceId: change.deviceId, + connectionState: change.connectionState, + failure: change.failure, + ); + } + @override String toString() => "ConnectionStateUpdate(deviceId: $deviceId, connectionState: $connectionState, failure: $failure)"; + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes bool operator ==(Object other) => other is ConnectionStateUpdate && other.runtimeType == runtimeType && deviceId == other.deviceId && connectionState == other.connectionState && failure == other.failure; + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes int get hashCode { var result = 17; result = 37 * result + deviceId.hashCode; @@ -43,15 +63,36 @@ abstract class $ConnectionStateUpdate { } } +class ConnectionStateUpdate$Change { + ConnectionStateUpdate$Change._( + this.deviceId, + this.connectionState, + this.failure, + ); + + String deviceId; + DeviceConnectionState connectionState; + GenericFailure? failure; +} + +// ignore: avoid_classes_with_only_static_members class ConnectionStateUpdate$ { static final deviceId = Lens( - (s_) => s_.deviceId, (s_, deviceId) => s_.copyWith(deviceId: deviceId)); + (deviceIdContainer) => deviceIdContainer.deviceId, + (deviceIdContainer, deviceId) => + deviceIdContainer.copyWith(deviceId: deviceId), + ); + static final connectionState = Lens( - (s_) => s_.connectionState, - (s_, connectionState) => - s_.copyWith(connectionState: connectionState)); + (connectionStateContainer) => connectionStateContainer.connectionState, + (connectionStateContainer, connectionState) => + connectionStateContainer.copyWith(connectionState: connectionState), + ); + static final failure = Lens?>( - (s_) => s_.failure, (s_, failure) => s_.copyWith(failure: failure)); + (failureContainer) => failureContainer.failure, + (failureContainer, failure) => failureContainer.copyWith(failure: failure), + ); } diff --git a/packages/reactive_ble_platform_interface/lib/src/model/discovered_device.g.dart b/packages/reactive_ble_platform_interface/lib/src/model/discovered_device.g.dart index 2041020c..c6ded36d 100644 --- a/packages/reactive_ble_platform_interface/lib/src/model/discovered_device.g.dart +++ b/packages/reactive_ble_platform_interface/lib/src/model/discovered_device.g.dart @@ -6,36 +6,60 @@ 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; List get serviceUuids; Uint8List get manufacturerData; int get rssi; - DiscoveredDevice copyWith( - {String? id, - String? name, - Map? serviceData, - List? serviceUuids, - Uint8List? manufacturerData, - int? rssi}) => + + DiscoveredDevice copyWith({ + String? id, + String? name, + Map? serviceData, + List? serviceUuids, + Uint8List? manufacturerData, + int? rssi, + }) => DiscoveredDevice( - id: id ?? this.id, - name: name ?? this.name, - serviceData: serviceData ?? this.serviceData, - serviceUuids: serviceUuids ?? this.serviceUuids, - manufacturerData: manufacturerData ?? this.manufacturerData, - rssi: rssi ?? this.rssi); + id: id ?? this.id, + name: name ?? this.name, + serviceData: serviceData ?? this.serviceData, + serviceUuids: serviceUuids ?? this.serviceUuids, + manufacturerData: manufacturerData ?? this.manufacturerData, + rssi: rssi ?? this.rssi, + ); + + DiscoveredDevice copyUsing( + void Function(DiscoveredDevice$Change change) mutator) { + final change = DiscoveredDevice$Change._( + this.id, + this.name, + this.serviceData, + this.serviceUuids, + this.manufacturerData, + this.rssi, + ); + mutator(change); + return DiscoveredDevice( + id: change.id, + name: change.name, + serviceData: change.serviceData, + serviceUuids: change.serviceUuids, + manufacturerData: change.manufacturerData, + rssi: change.rssi, + ); + } + @override String toString() => "DiscoveredDevice(id: $id, name: $name, serviceData: $serviceData, serviceUuids: $serviceUuids, manufacturerData: $manufacturerData, rssi: $rssi)"; + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes bool operator ==(Object other) => other is DiscoveredDevice && other.runtimeType == runtimeType && @@ -45,7 +69,9 @@ abstract class $DiscoveredDevice { const DeepCollectionEquality().equals(serviceUuids, other.serviceUuids) && manufacturerData == other.manufacturerData && rssi == other.rssi; + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes int get hashCode { var result = 17; result = 37 * result + id.hashCode; @@ -58,21 +84,56 @@ abstract class $DiscoveredDevice { } } +class DiscoveredDevice$Change { + DiscoveredDevice$Change._( + this.id, + this.name, + this.serviceData, + this.serviceUuids, + this.manufacturerData, + this.rssi, + ); + + String id; + String name; + Map serviceData; + List serviceUuids; + Uint8List manufacturerData; + int rssi; +} + +// ignore: avoid_classes_with_only_static_members class DiscoveredDevice$ { static final id = Lens( - (s_) => s_.id, (s_, id) => s_.copyWith(id: id)); + (idContainer) => idContainer.id, + (idContainer, id) => idContainer.copyWith(id: id), + ); + static final name = Lens( - (s_) => s_.name, (s_, name) => s_.copyWith(name: name)); + (nameContainer) => nameContainer.name, + (nameContainer, name) => nameContainer.copyWith(name: name), + ); + static final serviceData = Lens>( - (s_) => s_.serviceData, - (s_, serviceData) => s_.copyWith(serviceData: serviceData)); + (serviceDataContainer) => serviceDataContainer.serviceData, + (serviceDataContainer, serviceData) => + serviceDataContainer.copyWith(serviceData: serviceData), + ); + static final serviceUuids = Lens>( - (s_) => s_.serviceUuids, - (s_, serviceUuids) => s_.copyWith(serviceUuids: serviceUuids)); + (serviceUuidsContainer) => serviceUuidsContainer.serviceUuids, + (serviceUuidsContainer, serviceUuids) => + serviceUuidsContainer.copyWith(serviceUuids: serviceUuids), + ); + static final manufacturerData = Lens( - (s_) => s_.manufacturerData, - (s_, manufacturerData) => - s_.copyWith(manufacturerData: manufacturerData)); + (manufacturerDataContainer) => manufacturerDataContainer.manufacturerData, + (manufacturerDataContainer, manufacturerData) => + manufacturerDataContainer.copyWith(manufacturerData: manufacturerData), + ); + static final rssi = Lens( - (s_) => s_.rssi, (s_, rssi) => s_.copyWith(rssi: rssi)); + (rssiContainer) => rssiContainer.rssi, + (rssiContainer, rssi) => rssiContainer.copyWith(rssi: rssi), + ); } diff --git a/packages/reactive_ble_platform_interface/lib/src/model/discovered_service.g.dart b/packages/reactive_ble_platform_interface/lib/src/model/discovered_service.g.dart index 2bafb509..874d6351 100644 --- a/packages/reactive_ble_platform_interface/lib/src/model/discovered_service.g.dart +++ b/packages/reactive_ble_platform_interface/lib/src/model/discovered_service.g.dart @@ -6,27 +6,45 @@ part of 'discovered_service.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 $DiscoveredService { const $DiscoveredService(); + Uuid get serviceId; List get characteristicIds; List get includedServices; - DiscoveredService copyWith( - {Uuid? serviceId, - List? characteristicIds, - List? includedServices}) => + + DiscoveredService copyWith({ + Uuid? serviceId, + List? characteristicIds, + List? includedServices, + }) => DiscoveredService( - serviceId: serviceId ?? this.serviceId, - characteristicIds: characteristicIds ?? this.characteristicIds, - includedServices: includedServices ?? this.includedServices); + serviceId: serviceId ?? this.serviceId, + characteristicIds: characteristicIds ?? this.characteristicIds, + includedServices: includedServices ?? this.includedServices, + ); + + DiscoveredService copyUsing( + void Function(DiscoveredService$Change change) mutator) { + final change = DiscoveredService$Change._( + this.serviceId, + this.characteristicIds, + this.includedServices, + ); + mutator(change); + return DiscoveredService( + serviceId: change.serviceId, + characteristicIds: change.characteristicIds, + includedServices: change.includedServices, + ); + } + @override String toString() => "DiscoveredService(serviceId: $serviceId, characteristicIds: $characteristicIds, includedServices: $includedServices)"; + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes bool operator ==(Object other) => other is DiscoveredService && other.runtimeType == runtimeType && @@ -35,7 +53,9 @@ abstract class $DiscoveredService { .equals(characteristicIds, other.characteristicIds) && const DeepCollectionEquality() .equals(includedServices, other.includedServices); + @override + // ignore: avoid_equals_and_hash_code_on_mutable_classes int get hashCode { var result = 17; result = 37 * result + serviceId.hashCode; @@ -47,16 +67,38 @@ abstract class $DiscoveredService { } } +class DiscoveredService$Change { + DiscoveredService$Change._( + this.serviceId, + this.characteristicIds, + this.includedServices, + ); + + Uuid serviceId; + List characteristicIds; + List includedServices; +} + +// ignore: avoid_classes_with_only_static_members class DiscoveredService$ { - static final serviceId = Lens((s_) => s_.serviceId, - (s_, serviceId) => s_.copyWith(serviceId: serviceId)); + static final serviceId = Lens( + (serviceIdContainer) => serviceIdContainer.serviceId, + (serviceIdContainer, serviceId) => + serviceIdContainer.copyWith(serviceId: serviceId), + ); + static final characteristicIds = Lens>( - (s_) => s_.characteristicIds, - (s_, characteristicIds) => - s_.copyWith(characteristicIds: characteristicIds)); + (characteristicIdsContainer) => + characteristicIdsContainer.characteristicIds, + (characteristicIdsContainer, characteristicIds) => + characteristicIdsContainer.copyWith( + characteristicIds: characteristicIds), + ); + static final includedServices = Lens>( - (s_) => s_.includedServices, - (s_, includedServices) => - s_.copyWith(includedServices: includedServices)); + (includedServicesContainer) => includedServicesContainer.includedServices, + (includedServicesContainer, includedServices) => + includedServicesContainer.copyWith(includedServices: includedServices), + ); } diff --git a/packages/reactive_ble_platform_interface/pubspec.lock b/packages/reactive_ble_platform_interface/pubspec.lock index 6734799b..50ab1a1b 100644 --- a/packages/reactive_ble_platform_interface/pubspec.lock +++ b/packages/reactive_ble_platform_interface/pubspec.lock @@ -7,28 +7,28 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "19.0.0" + version: "22.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.2" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.3.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -42,56 +42,56 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.7" + version: "1.0.0" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "3.0.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.4" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.12.2" + version: "2.1.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.1.12" + version: "7.1.0" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.1.1" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.0.4" + version: "8.1.2" characters: dependency: transitive description: @@ -105,7 +105,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -119,7 +119,7 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.3.3" clock: dependency: transitive description: @@ -133,7 +133,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "4.1.0" collection: dependency: "direct main" description: @@ -147,7 +147,7 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" crypto: dependency: transitive description: @@ -161,7 +161,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.3.14" + version: "2.1.0" fake_async: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" fixnum: dependency: transitive description: @@ -200,6 +200,13 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" functional_data: dependency: "direct main" description: @@ -213,7 +220,7 @@ packages: name: functional_data_generator url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.2" glob: dependency: transitive description: @@ -227,14 +234,14 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.1.0" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" http_parser: dependency: transitive description: @@ -248,7 +255,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" js: dependency: transitive description: @@ -262,7 +269,7 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.1.0" lints: dependency: transitive description: @@ -276,7 +283,7 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" matcher: dependency: transitive description: @@ -290,7 +297,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -304,14 +311,14 @@ packages: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.3" + version: "5.0.15" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -325,14 +332,14 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.11.0" + version: "1.11.1" plugin_platform_interface: dependency: "direct main" description: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" pool: dependency: transitive description: @@ -346,21 +353,21 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" shelf_web_socket: dependency: transitive description: @@ -379,7 +386,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "0.9.10+4" + version: "1.0.3" source_span: dependency: transitive description: @@ -428,7 +435,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: @@ -463,7 +470,7 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" yaml: dependency: transitive description: diff --git a/packages/reactive_ble_platform_interface/pubspec.yaml b/packages/reactive_ble_platform_interface/pubspec.yaml index de873beb..e14473c4 100644 --- a/packages/reactive_ble_platform_interface/pubspec.yaml +++ b/packages/reactive_ble_platform_interface/pubspec.yaml @@ -12,16 +12,16 @@ dependencies: flutter: sdk: flutter functional_data: ^1.0.0 - meta: ^1.3.0 + meta: ^1.7.0 - plugin_platform_interface: ^2.0.0 + plugin_platform_interface: ^2.0.1 dev_dependencies: - build_runner: ^1.12.1 + build_runner: ^2.1.2 flutter_lints: ^1.0.3 flutter_test: sdk: flutter - functional_data_generator: ^1.0.0 + functional_data_generator: ^1.1.2 mockito: ^5.0.2 flutter: From 36c4598cc3b967f75064a4a79f96c501ef2d922d Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 14:56:59 +0200 Subject: [PATCH 2/9] update dependencies for reactive ble mobile --- example/pubspec.lock | 90 +++++++++------------- packages/flutter_reactive_ble/pubspec.lock | 24 +++--- packages/reactive_ble_mobile/pubspec.lock | 38 ++++----- packages/reactive_ble_mobile/pubspec.yaml | 2 +- 4 files changed, 70 insertions(+), 84 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 34034f25..6d02588f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,28 +7,28 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "12.0.0" + version: "22.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.40.7" + version: "1.7.2" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "2.3.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -42,14 +42,14 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" + version: "2.0.3" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.5" + version: "0.4.7" build_daemon: dependency: transitive description: @@ -63,21 +63,21 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.5.3" + version: "2.0.4" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.11.1+1" + version: "1.12.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.1.7" + version: "6.1.12" built_collection: dependency: transitive description: @@ -105,21 +105,21 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: name: checked_yaml url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.1" cli_util: dependency: transitive description: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.3.3" clock: dependency: transitive description: @@ -147,28 +147,28 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "3.0.1" dart_style: dependency: transitive description: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.3.10" + version: "2.1.0" dependency_validator: dependency: "direct dev" description: name: dependency_validator url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "3.1.0" fake_async: dependency: transitive description: @@ -182,7 +182,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "5.2.1" + version: "6.1.2" fixnum: dependency: transitive description: @@ -227,21 +227,21 @@ packages: name: functional_data_generator url: "https://pub.dartlang.org" source: hosted - version: "1.0.0-nullsafety.2" + version: "1.1.2" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "2.0.1" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "1.0.0" http_multi_server: dependency: transitive description: @@ -269,7 +269,7 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "0.3.5" + version: "1.0.3" js: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "4.1.0" lints: dependency: transitive description: @@ -297,7 +297,7 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "0.11.4" + version: "1.0.2" matcher: dependency: transitive description: @@ -311,7 +311,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -326,27 +326,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - node_interop: - dependency: transitive - description: - name: node_interop - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.1" - node_io: - dependency: transitive - description: - name: node_io - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "2.0.2" path: dependency: transitive description: @@ -395,27 +381,27 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "1.4.4" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "0.1.8" + version: "1.1.0" reactive_ble_mobile: dependency: transitive description: - name: reactive_ble_mobile - url: "https://pub.dartlang.org" - source: hosted + path: "../packages/reactive_ble_mobile" + relative: true + source: path version: "4.0.0" reactive_ble_platform_interface: dependency: transitive description: - name: reactive_ble_platform_interface - url: "https://pub.dartlang.org" - source: hosted + path: "../packages/reactive_ble_platform_interface" + relative: true + source: path version: "4.0.0" shelf: dependency: transitive @@ -442,7 +428,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "0.9.10+2" + version: "1.0.3" source_span: dependency: transitive description: @@ -491,7 +477,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: @@ -519,7 +505,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "0.9.7+15" + version: "1.0.0" web_socket_channel: dependency: transitive description: @@ -533,7 +519,7 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.20.0" + flutter: ">=2.0.0" diff --git a/packages/flutter_reactive_ble/pubspec.lock b/packages/flutter_reactive_ble/pubspec.lock index 4ad753a0..1713528a 100644 --- a/packages/flutter_reactive_ble/pubspec.lock +++ b/packages/flutter_reactive_ble/pubspec.lock @@ -14,7 +14,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "1.7.2" args: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -105,7 +105,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -297,7 +297,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -371,16 +371,16 @@ packages: reactive_ble_mobile: dependency: "direct main" description: - name: reactive_ble_mobile - url: "https://pub.dartlang.org" - source: hosted + path: "../reactive_ble_mobile" + relative: true + source: path version: "4.0.0" reactive_ble_platform_interface: dependency: "direct main" description: - name: reactive_ble_platform_interface - url: "https://pub.dartlang.org" - source: hosted + path: "../reactive_ble_platform_interface" + relative: true + source: path version: "4.0.0" shelf: dependency: transitive @@ -456,7 +456,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: @@ -501,4 +501,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.20.0" + flutter: ">=1.17.0" diff --git a/packages/reactive_ble_mobile/pubspec.lock b/packages/reactive_ble_mobile/pubspec.lock index 3c74ea48..20e1a09c 100644 --- a/packages/reactive_ble_mobile/pubspec.lock +++ b/packages/reactive_ble_mobile/pubspec.lock @@ -7,28 +7,28 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "26.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "2.3.0" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -70,7 +70,7 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" build_runner_core: dependency: transitive description: @@ -84,7 +84,7 @@ packages: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: transitive description: @@ -105,7 +105,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -161,7 +161,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" fake_async: dependency: transitive description: @@ -199,7 +199,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" functional_data: dependency: transitive description: @@ -220,7 +220,7 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" http_multi_server: dependency: transitive description: @@ -255,14 +255,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.1.0" logging: dependency: transitive description: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" matcher: dependency: transitive description: @@ -276,7 +276,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -290,14 +290,14 @@ packages: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.14" + version: "5.0.16" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -339,14 +339,14 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" reactive_ble_platform_interface: dependency: "direct main" description: @@ -379,7 +379,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.1.0" source_span: dependency: transitive description: @@ -428,7 +428,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" timing: dependency: transitive description: diff --git a/packages/reactive_ble_mobile/pubspec.yaml b/packages/reactive_ble_mobile/pubspec.yaml index 293c7c01..41437a77 100644 --- a/packages/reactive_ble_mobile/pubspec.yaml +++ b/packages/reactive_ble_mobile/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: reactive_ble_platform_interface: ^4.0.0 dev_dependencies: - build_runner: ^2.1.1 + build_runner: ^2.1.2 flutter_test: sdk: flutter mockito: ^5.0.14 From f3a37d97c1b6e13eda57cc08c5ccdd39308732be Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 15:01:28 +0200 Subject: [PATCH 3/9] upgrade dependencies for flutter reactive ble --- packages/flutter_reactive_ble/pubspec.lock | 38 +++++++++++----------- packages/flutter_reactive_ble/pubspec.yaml | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/flutter_reactive_ble/pubspec.lock b/packages/flutter_reactive_ble/pubspec.lock index 1713528a..16a4e70a 100644 --- a/packages/flutter_reactive_ble/pubspec.lock +++ b/packages/flutter_reactive_ble/pubspec.lock @@ -21,7 +21,7 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" async: dependency: transitive description: @@ -70,7 +70,7 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" build_runner_core: dependency: transitive description: @@ -84,7 +84,7 @@ packages: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: transitive description: @@ -161,7 +161,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" fake_async: dependency: transitive description: @@ -206,7 +206,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" functional_data: dependency: "direct main" description: @@ -234,7 +234,7 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" http_multi_server: dependency: transitive description: @@ -269,7 +269,7 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.1.0" lints: dependency: transitive description: @@ -283,7 +283,7 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" matcher: dependency: transitive description: @@ -311,14 +311,14 @@ packages: name: mockito url: "https://pub.dartlang.org" source: hosted - version: "5.0.14" + version: "5.0.15" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -360,27 +360,27 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" reactive_ble_mobile: dependency: "direct main" description: - path: "../reactive_ble_mobile" - relative: true - source: path + name: reactive_ble_mobile + url: "https://pub.dartlang.org" + source: hosted version: "4.0.0" reactive_ble_platform_interface: dependency: "direct main" description: - path: "../reactive_ble_platform_interface" - relative: true - source: path + name: reactive_ble_platform_interface + url: "https://pub.dartlang.org" + source: hosted version: "4.0.0" shelf: dependency: transitive @@ -501,4 +501,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.17.0" + flutter: ">=1.20.0" diff --git a/packages/flutter_reactive_ble/pubspec.yaml b/packages/flutter_reactive_ble/pubspec.yaml index 01464cdb..4c6fb6ad 100644 --- a/packages/flutter_reactive_ble/pubspec.yaml +++ b/packages/flutter_reactive_ble/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: reactive_ble_platform_interface: ^4.0.0 dev_dependencies: - build_runner: ^2.1.0 + build_runner: ^2.1.2 flutter_lints: ^1.0.3 flutter_test: sdk: flutter From 7374de7a203e6afe1f04e607c3fa3767ba172091 Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 15:08:31 +0200 Subject: [PATCH 4/9] update example app --- example/pubspec.lock | 33 +++++++++++-------- example/pubspec.yaml | 6 ++-- .../lib/src/reactive_ble.dart | 2 +- .../test/connected_device_operation_test.dart | 2 +- .../args_to_protobuf_converter_test.dart | 2 +- .../converter/protobuf_converter_test.dart | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 6d02588f..65839542 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,21 +42,21 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.0" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "0.4.7" + version: "1.0.0" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "3.0.0" build_resolvers: dependency: transitive description: @@ -70,21 +70,21 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.12.2" + version: "2.1.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "6.1.12" + version: "7.1.0" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: transitive description: @@ -133,7 +133,7 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "4.1.0" collection: dependency: transitive description: @@ -214,6 +214,13 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" functional_data: dependency: "direct main" description: @@ -241,14 +248,14 @@ packages: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "2.1.0" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "3.0.1" http_parser: dependency: transitive description: @@ -374,7 +381,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.0" pub_semver: dependency: transitive description: @@ -416,7 +423,7 @@ packages: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "0.2.4+1" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -484,7 +491,7 @@ packages: name: timing url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+3" + version: "1.0.0" typed_data: dependency: transitive description: @@ -512,7 +519,7 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "2.1.0" yaml: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 51a9f078..23bb61ee 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -16,15 +16,15 @@ dependencies: functional_data: ^1.0.0 intl: ^0.17.0 - provider: ^5.0.0 + provider: ^6.0.0 dev_dependencies: - build_runner: ^1.10.11 + build_runner: ^2.1.2 dependency_validator: ^3.1.0 flutter_test: sdk: flutter - functional_data_generator: ^1.0.0-nullsafety.1 + functional_data_generator: ^1.1.2 flutter: uses-material-design: true diff --git a/packages/flutter_reactive_ble/lib/src/reactive_ble.dart b/packages/flutter_reactive_ble/lib/src/reactive_ble.dart index a7c88fe8..053a882b 100644 --- a/packages/flutter_reactive_ble/lib/src/reactive_ble.dart +++ b/packages/flutter_reactive_ble/lib/src/reactive_ble.dart @@ -8,8 +8,8 @@ import 'package:flutter_reactive_ble/src/device_scanner.dart'; import 'package:flutter_reactive_ble/src/discovered_devices_registry.dart'; import 'package:flutter_reactive_ble/src/rx_ext/repeater.dart'; import 'package:meta/meta.dart'; -import 'package:reactive_ble_platform_interface/reactive_ble_platform_interface.dart'; import 'package:reactive_ble_mobile/reactive_ble_mobile.dart'; +import 'package:reactive_ble_platform_interface/reactive_ble_platform_interface.dart'; /// [FlutterReactiveBle] is the facade of the library. Its interface allows to /// perform all the supported BLE operations. diff --git a/packages/flutter_reactive_ble/test/connected_device_operation_test.dart b/packages/flutter_reactive_ble/test/connected_device_operation_test.dart index 5b810756..4cccdbf1 100644 --- a/packages/flutter_reactive_ble/test/connected_device_operation_test.dart +++ b/packages/flutter_reactive_ble/test/connected_device_operation_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter_reactive_ble/src/connected_device_operation.dart'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; +import 'package:flutter_reactive_ble/src/connected_device_operation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/reactive_ble_mobile/test/converter/args_to_protobuf_converter_test.dart b/packages/reactive_ble_mobile/test/converter/args_to_protobuf_converter_test.dart index 0e2810eb..836ea442 100644 --- a/packages/reactive_ble_mobile/test/converter/args_to_protobuf_converter_test.dart +++ b/packages/reactive_ble_mobile/test/converter/args_to_protobuf_converter_test.dart @@ -1,6 +1,6 @@ +import 'package:flutter_test/flutter_test.dart'; import 'package:reactive_ble_mobile/src/converter/args_to_protubuf_converter.dart'; import 'package:reactive_ble_mobile/src/generated/bledata.pb.dart' as pb; -import 'package:flutter_test/flutter_test.dart'; import 'package:reactive_ble_platform_interface/src/model/connection_priority.dart'; import 'package:reactive_ble_platform_interface/src/model/qualified_characteristic.dart'; import 'package:reactive_ble_platform_interface/src/model/scan_mode.dart'; diff --git a/packages/reactive_ble_mobile/test/converter/protobuf_converter_test.dart b/packages/reactive_ble_mobile/test/converter/protobuf_converter_test.dart index d6f271d0..5ce3a9fe 100644 --- a/packages/reactive_ble_mobile/test/converter/protobuf_converter_test.dart +++ b/packages/reactive_ble_mobile/test/converter/protobuf_converter_test.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; +import 'package:flutter_test/flutter_test.dart'; import 'package:reactive_ble_mobile/src/converter/protobuf_converter.dart'; import 'package:reactive_ble_mobile/src/generated/bledata.pb.dart' as pb; -import 'package:flutter_test/flutter_test.dart'; import 'package:reactive_ble_platform_interface/src/model/ble_status.dart'; import 'package:reactive_ble_platform_interface/src/model/characteristic_value.dart'; import 'package:reactive_ble_platform_interface/src/model/clear_gatt_cache_error.dart'; From a7407c15a1f7fa00246458f9e75e188d1203d302 Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 16:16:56 +0200 Subject: [PATCH 5/9] rename Task to Subjectask --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile.lock | 6 ++-- .../CharacteristicNotifyTaskController.swift | 10 +++--- .../CharacteristicWriteTaskController.swift | 10 +++--- .../Tasks/Connect/ConnectTaskController.swift | 10 +++--- .../PeripheralTaskController.swift | 6 ++-- .../PeripheralTaskRegistry.swift | 34 +++++++++---------- ...aracteristicsDiscoveryTaskController.swift | 12 +++---- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9367d483..8d4492f9 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f481a25f..02904174 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - Flutter (1.0.0) - - Protobuf (3.17.0) + - Protobuf (3.18.0) - reactive_ble_mobile (0.0.1): - Flutter - Protobuf (~> 3.5) @@ -23,8 +23,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/reactive_ble_mobile/ios" SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c - Protobuf: 7327d4444215b5f18e560a97f879ff5503c4581c + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Protobuf: 1a37ebea1338949e9ac35a3f06e80b3f536eec8d reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c SwiftProtobuf: 9c85136c6ba74b0a1b84279dbf0f6db8efb714e0 diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift index 592eebe6..b3988c63 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift @@ -4,22 +4,22 @@ struct CharacteristicNotifyTaskController: PeripheralTaskController { typealias TaskSpec = CharacteristicNotifyTaskSpec - private let task: Task + private let task: SubjectTask - init(_ task: Task) { + init(_ task: SubjectTask) { self.task = task } - func start(characteristic: CBCharacteristic) -> Task { + func start(characteristic: CBCharacteristic) -> SubjectTask { characteristic.service.peripheral.setNotifyValue(task.params.state.isOn, for: characteristic) return task.with(state: task.state.processing(.applying)) } - func cancel(error: Error) -> Task { + func cancel(error: Error) -> SubjectTask { return task.with(state: task.state.finished(error)) } - func complete(error: Error?) -> Task { + func complete(error: Error?) -> SubjectTask { return task.with(state: task.state.finished(error)) } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicWrite/CharacteristicWriteTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicWrite/CharacteristicWriteTaskController.swift index 1f32cda8..f4ea621e 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicWrite/CharacteristicWriteTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicWrite/CharacteristicWriteTaskController.swift @@ -4,13 +4,13 @@ struct CharacteristicWriteTaskController: PeripheralTaskController { typealias TaskSpec = CharacteristicWriteTaskSpec - private let task: Task + private let task: SubjectTask - init(_ task: Task) { + init(_ task: SubjectTask) { self.task = task } - func start(peripheral: CBPeripheral) -> Task { + func start(peripheral: CBPeripheral) -> SubjectTask { guard peripheral.state == .connected, let service = peripheral.services?.first(where: { $0.uuid == task.key.serviceID }), @@ -25,11 +25,11 @@ struct CharacteristicWriteTaskController: PeripheralTaskController { return task.with(state: task.state.processing(.writing)) } - func cancel(error: Error) -> Task { + func cancel(error: Error) -> SubjectTask { return task.with(state: task.state.finished(error)) } - func handleWrite(error: Error?) -> Task { + func handleWrite(error: Error?) -> SubjectTask { return task.with(state: task.state.finished(error)) } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/Connect/ConnectTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/Connect/ConnectTaskController.swift index 1f342e85..5eb67c19 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/Connect/ConnectTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/Connect/ConnectTaskController.swift @@ -4,13 +4,13 @@ struct ConnectTaskController: PeripheralTaskController { typealias TaskSpec = ConnectTaskSpec - private let task: Task + private let task: SubjectTask - init(_ task: Task) { + init(_ task: SubjectTask) { self.task = task } - func connect(centralManager: CBCentralManager, peripheral: CBPeripheral) -> Task { + func connect(centralManager: CBCentralManager, peripheral: CBPeripheral) -> SubjectTask { guard case .pending = task.state else { assert(false) @@ -22,7 +22,7 @@ struct ConnectTaskController: PeripheralTaskController { return task.with(state: task.state.processing(.connecting)) } - func handleConnectionChange(_ connectionChange: ConnectionChange) -> Task { + func handleConnectionChange(_ connectionChange: ConnectionChange) -> SubjectTask { guard case .processing(since: _, .connecting) = task.state else { assert(false) @@ -32,7 +32,7 @@ struct ConnectTaskController: PeripheralTaskController { return task.with(state: task.state.finished(connectionChange)) } - func cancel(centralManager: CBCentralManager, peripheral: CBPeripheral, error: Error?) -> Task { + func cancel(centralManager: CBCentralManager, peripheral: CBPeripheral, error: Error?) -> SubjectTask { switch task.state { case .pending: return task.with(state: task.state.finished(.failedToConnect(error))) diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskController.swift index e04ef9b6..21bd47a3 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskController.swift @@ -2,14 +2,14 @@ protocol PeripheralTaskController { associatedtype TaskSpec: PeripheralTaskSpec - typealias Task = PeripheralTask + typealias SubjectTask = PeripheralTask - init(_ task: Task) + init(_ task: SubjectTask) } extension PeripheralTaskController { - func improperHandling(currentState: Task.State, handler: String = #function) -> Error { + func improperHandling(currentState: SubjectTask.State, handler: String = #function) -> Error { return PluginError.internalInconcictency(details: "for a task in state \(currentState) a forbidden handler \(handler) is called") } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskRegistry.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskRegistry.swift index fa990671..37e6f8fb 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskRegistry.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/PeripheralTaskRegistry/PeripheralTaskRegistry.swift @@ -2,8 +2,8 @@ import Foundation final class PeripheralTaskRegistry { - typealias Task = Controller.Task - typealias TaskCompletionHandler = (Task.Key, Task.Params, Task.Result) -> Void + typealias SubjectTask = Controller.SubjectTask + typealias TaskCompletionHandler = (SubjectTask.Key, SubjectTask.Params, SubjectTask.Result) -> Void private var tasks = TaskQueue() private var scheduledTimeouts = [TaskQueue.Record.UniqueID: Timer]() @@ -11,12 +11,12 @@ final class PeripheralTaskRegistry { var log: (String) -> Void = { _ in } func registerTask( - key: Task.Key, - params: Task.Params, - timeout: Task.Timeout? = nil, - completion: @escaping Task.CompletionHandler + key: SubjectTask.Key, + params: SubjectTask.Params, + timeout: SubjectTask.Timeout? = nil, + completion: @escaping SubjectTask.CompletionHandler ) { - let task = Task( + let task = SubjectTask( key: key, params: params, timeout: timeout, @@ -27,8 +27,8 @@ final class PeripheralTaskRegistry { } func updateTask( - key: Task.Key, - action: (Controller) -> Task + key: SubjectTask.Key, + action: (Controller) -> SubjectTask ) { guard let record = tasks.firstWith(key: key) else { return } @@ -55,8 +55,8 @@ final class PeripheralTaskRegistry { } func updateTasks( - in group: Task.Group, - action: (Controller) -> Task + in group: SubjectTask.Group, + action: (Controller) -> SubjectTask ) { tasks.update(where: { $0.isMember(of: group) }) { record in let taskController = Controller(record.task) @@ -86,7 +86,7 @@ final class PeripheralTaskRegistry { } } - private func scheduleTaskTimeout(_ uniqueID: TaskQueue.Record.UniqueID, _ timeout: Task.Timeout) { + private func scheduleTaskTimeout(_ uniqueID: TaskQueue.Record.UniqueID, _ timeout: SubjectTask.Timeout) { let timer = Timer.scheduledTimer( withTimeInterval: timeout.duration, repeats: false, @@ -107,14 +107,14 @@ final class PeripheralTaskRegistry { var count: Int { return records.count } var totalAdded: Int { return counter.value } - func add(_ task: Task) { + func add(_ task: SubjectTask) { records.append(Record( uniqueID: counter.increment(), task: task )) } - func firstWith(key: Task.Key) -> Record? { + func firstWith(key: SubjectTask.Key) -> Record? { return records.first(where: { $0.task.key == key }) } @@ -129,7 +129,7 @@ final class PeripheralTaskRegistry { records[index] = record } - func update(where p: (Task) -> Bool, _ body: (Record) -> Void) { + func update(where p: (SubjectTask) -> Bool, _ body: (Record) -> Void) { Array(records) .filter({ p($0.task) }) .forEach(body) @@ -147,9 +147,9 @@ final class PeripheralTaskRegistry { typealias UniqueID = Int let uniqueID: UniqueID - let task: Task + let task: SubjectTask - func with(task: Task) -> Record { + func with(task: SubjectTask) -> Record { return .init(uniqueID: uniqueID, task: task) } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/ServicesWithCharacteristicsDiscovery/ServicesWithCharacteristicsDiscoveryTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/ServicesWithCharacteristicsDiscovery/ServicesWithCharacteristicsDiscoveryTaskController.swift index 6d6d52da..b3158b24 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/ServicesWithCharacteristicsDiscovery/ServicesWithCharacteristicsDiscoveryTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/ServicesWithCharacteristicsDiscovery/ServicesWithCharacteristicsDiscoveryTaskController.swift @@ -4,13 +4,13 @@ struct ServicesWithCharacteristicsDiscoveryTaskController: PeripheralTaskControl typealias TaskSpec = ServicesWithCharacteristicsDiscoveryTaskSpec - private let task: Task + private let task: SubjectTask - init(_ task: Task) { + init(_ task: SubjectTask) { self.task = task } - func start(peripheral: CBPeripheral) -> Task { + func start(peripheral: CBPeripheral) -> SubjectTask { guard case .pending = task.state else { return task @@ -28,12 +28,12 @@ struct ServicesWithCharacteristicsDiscoveryTaskController: PeripheralTaskControl } } - func cancel(error: Error) -> Task { + func cancel(error: Error) -> SubjectTask { return task .with(state: task.state.finished([error])) } - func handleServicesDiscovery(peripheral: CBPeripheral, error: Error?) -> Task { + func handleServicesDiscovery(peripheral: CBPeripheral, error: Error?) -> SubjectTask { guard case .processing(since: _, .discoveringServices) = task.state else { return task @@ -67,7 +67,7 @@ struct ServicesWithCharacteristicsDiscoveryTaskController: PeripheralTaskControl func handleCharacteristicsDiscovery( service: CBService, error: Error? - ) -> Task { + ) -> SubjectTask { guard case .processing(since: _, .discoveringCharacteristics(let servicesLeft, let errors)) = task.state, task.params.servicesWithCharacteristicsToDiscover.services.map({ $0.contains(service.uuid) }) != false From 64186388a0d387f7296811abd614cb3f46a3630d Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 18:44:39 +0200 Subject: [PATCH 6/9] handle optional cbservice --- .../QualifiedCharacteristic.swift | 4 ++-- .../ios/Classes/ReactiveBle/Central.swift | 22 ++++++++++++++----- .../CharacteristicNotifyTaskController.swift | 10 ++++++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift b/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift index a17b6b12..6cdb8a9c 100644 --- a/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift +++ b/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift @@ -13,8 +13,8 @@ extension QualifiedCharacteristic { init(_ characteristic: CBCharacteristic) { self.init( id: characteristic.uuid, - serviceID: characteristic.service.uuid, - peripheralID: characteristic.service.peripheral.identifier + serviceID: characteristic.service?.uuid ?? ServiceID(), + peripheralID: characteristic.service?.peripheral?.identifier ?? PeripheralID() ) } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift index 8d595fe8..9eff933a 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift @@ -77,7 +77,7 @@ final class Central { }, onCharacteristicsDiscovery: papply(weak: self) { central, service, error in central.servicesWithCharacteristicsDiscoveryRegistry.updateTask( - key: service.peripheral.identifier, + key: service.peripheral!.identifier, action: { $0.handleCharacteristicsDiscovery(service: service, error: error) } ) }, @@ -226,8 +226,11 @@ final class Central { guard characteristic.properties.contains(.read) else { throw Failure.notReadable(qualifiedCharacteristic) } - - characteristic.service.peripheral.readValue(for: characteristic) + + guard let value = characteristic.service?.peripheral?.readValue(for: characteristic) else{ + throw Failure.characteristicNotFound(qualifiedCharacteristic) + } + return value } func writeWithResponse( @@ -247,10 +250,15 @@ final class Central { completion(central, qualifiedCharacteristic, error) } ) + + + guard let peripheral = characteristic.service?.peripheral else{ + throw Failure.peripheralIsUnknown(qualifiedCharacteristic.peripheralID) + } characteristicWriteRegistry.updateTask( key: qualifiedCharacteristic, - action: { $0.start(peripheral: characteristic.service.peripheral) } + action: { $0.start(peripheral: peripheral) } ) } @@ -263,7 +271,11 @@ final class Central { guard characteristic.properties.contains(.writeWithoutResponse) else { throw Failure.notWritable(qualifiedCharacteristic) } - characteristic.service.peripheral.writeValue(value, for: characteristic, type: .withoutResponse) + guard let response = characteristic.service?.peripheral?.writeValue(value, for: characteristic, type: .withoutResponse) else{ + throw Failure.characteristicNotFound(qualifiedCharacteristic) + } + + return response } func maximumWriteValueLength(for peripheral: PeripheralID, type: CBCharacteristicWriteType) throws -> Int { diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift index b3988c63..e068629d 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift @@ -11,7 +11,11 @@ struct CharacteristicNotifyTaskController: PeripheralTaskController { } func start(characteristic: CBCharacteristic) -> SubjectTask { - characteristic.service.peripheral.setNotifyValue(task.params.state.isOn, for: characteristic) + guard let peripheral = characteristic.service?.peripheral else { + return task.with(state: task.state.finished(CharacteristicNotifyError.unExpected)) + } + + peripheral.setNotifyValue(task.params.state.isOn, for: characteristic) return task.with(state: task.state.processing(.applying)) } @@ -22,4 +26,8 @@ struct CharacteristicNotifyTaskController: PeripheralTaskController { func complete(error: Error?) -> SubjectTask { return task.with(state: task.state.finished(error)) } + + private enum CharacteristicNotifyError: Error{ + case unExpected; + } } From 55604798e370ac7d8693f84778214cae0ea2ce47 Mon Sep 17 00:00:00 2001 From: Remon Date: Sat, 18 Sep 2021 18:48:57 +0200 Subject: [PATCH 7/9] use new xcode version on CI --- codemagic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codemagic.yaml b/codemagic.yaml index de8d6f64..b648677d 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -7,7 +7,7 @@ workflows: max_build_duration: 60 environment: flutter: stable - xcode: latest + xcode: 13.0 cocoapods: default cache: cache_paths: [] From 9143650c734c2256c9be17400c81228323e8206e Mon Sep 17 00:00:00 2001 From: Remon Date: Wed, 22 Sep 2021 19:54:31 +0200 Subject: [PATCH 8/9] improve formatting and small fixes --- .../QualifiedCharacteristic.swift | 2 +- .../ios/Classes/ReactiveBle/Central.swift | 20 +++++++++---------- .../CharacteristicNotifyTaskController.swift | 5 ++--- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift b/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift index 6cdb8a9c..033a047c 100644 --- a/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift +++ b/packages/reactive_ble_mobile/ios/Classes/BleData extras/QualifiedCharacteristic.swift @@ -14,7 +14,7 @@ extension QualifiedCharacteristic { self.init( id: characteristic.uuid, serviceID: characteristic.service?.uuid ?? ServiceID(), - peripheralID: characteristic.service?.peripheral?.identifier ?? PeripheralID() + peripheralID: characteristic.service?.peripheral?.identifier ?? PeripheralID(uuid: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)) ) } } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift index 9eff933a..95f2f9dc 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Central.swift @@ -227,10 +227,11 @@ final class Central { guard characteristic.properties.contains(.read) else { throw Failure.notReadable(qualifiedCharacteristic) } - guard let value = characteristic.service?.peripheral?.readValue(for: characteristic) else{ - throw Failure.characteristicNotFound(qualifiedCharacteristic) - } - return value + guard let peripheral = characteristic.service?.peripheral + else { throw Failure.peripheralIsUnknown(qualifiedCharacteristic.peripheralID) } + + peripheral.readValue(for: characteristic) + } func writeWithResponse( @@ -251,10 +252,8 @@ final class Central { } ) - - guard let peripheral = characteristic.service?.peripheral else{ - throw Failure.peripheralIsUnknown(qualifiedCharacteristic.peripheralID) - } + guard let peripheral = characteristic.service?.peripheral + else{ throw Failure.peripheralIsUnknown(qualifiedCharacteristic.peripheralID) } characteristicWriteRegistry.updateTask( key: qualifiedCharacteristic, @@ -271,9 +270,8 @@ final class Central { guard characteristic.properties.contains(.writeWithoutResponse) else { throw Failure.notWritable(qualifiedCharacteristic) } - guard let response = characteristic.service?.peripheral?.writeValue(value, for: characteristic, type: .withoutResponse) else{ - throw Failure.characteristicNotFound(qualifiedCharacteristic) - } + guard let response = characteristic.service?.peripheral?.writeValue(value, for: characteristic, type: .withoutResponse) + else { throw Failure.characteristicNotFound(qualifiedCharacteristic) } return response } diff --git a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift index e068629d..a0119c50 100644 --- a/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift +++ b/packages/reactive_ble_mobile/ios/Classes/ReactiveBle/Tasks/CharacteristicNotify/CharacteristicNotifyTaskController.swift @@ -11,9 +11,8 @@ struct CharacteristicNotifyTaskController: PeripheralTaskController { } func start(characteristic: CBCharacteristic) -> SubjectTask { - guard let peripheral = characteristic.service?.peripheral else { - return task.with(state: task.state.finished(CharacteristicNotifyError.unExpected)) - } + guard let peripheral = characteristic.service?.peripheral + else { return task.with(state: task.state.finished(CharacteristicNotifyError.unExpected)) } peripheral.setNotifyValue(task.params.state.isOn, for: characteristic) return task.with(state: task.state.processing(.applying)) From 96a4644b56489e862f02eb903fe100147d51a56e Mon Sep 17 00:00:00 2001 From: Remon Date: Thu, 23 Sep 2021 20:05:45 +0200 Subject: [PATCH 9/9] prepare version 4.0.1 --- packages/flutter_reactive_ble/CHANGELOG.md | 4 ++++ packages/flutter_reactive_ble/pubspec.lock | 6 +++--- packages/flutter_reactive_ble/pubspec.yaml | 9 ++++----- packages/reactive_ble_mobile/CHANGELOG.md | 4 ++++ packages/reactive_ble_mobile/pubspec.lock | 2 +- packages/reactive_ble_mobile/pubspec.yaml | 7 +++---- packages/reactive_ble_platform_interface/CHANGELOG.md | 4 ++++ packages/reactive_ble_platform_interface/pubspec.lock | 2 +- packages/reactive_ble_platform_interface/pubspec.yaml | 4 ++-- 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/flutter_reactive_ble/CHANGELOG.md b/packages/flutter_reactive_ble/CHANGELOG.md index 453ddd2a..43484462 100644 --- a/packages/flutter_reactive_ble/CHANGELOG.md +++ b/packages/flutter_reactive_ble/CHANGELOG.md @@ -1,5 +1,9 @@ # Main releases +## 4.0.1 + +* Add support for iOS 15 + ## 4.0.0 * Support federated plugin structure diff --git a/packages/flutter_reactive_ble/pubspec.lock b/packages/flutter_reactive_ble/pubspec.lock index 16a4e70a..651b9a5e 100644 --- a/packages/flutter_reactive_ble/pubspec.lock +++ b/packages/flutter_reactive_ble/pubspec.lock @@ -374,14 +374,14 @@ packages: name: reactive_ble_mobile url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" reactive_ble_platform_interface: dependency: "direct main" description: name: reactive_ble_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" shelf: dependency: transitive description: @@ -501,4 +501,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.20.0" + flutter: ">=2.0.0" diff --git a/packages/flutter_reactive_ble/pubspec.yaml b/packages/flutter_reactive_ble/pubspec.yaml index 4c6fb6ad..3befef94 100644 --- a/packages/flutter_reactive_ble/pubspec.yaml +++ b/packages/flutter_reactive_ble/pubspec.yaml @@ -1,11 +1,11 @@ name: flutter_reactive_ble description: Reactive Bluetooth Low Energy (BLE) plugin that can communicate with multiple devices -version: 4.0.0 +version: 4.0.1 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: sdk: '>=2.12.0 <3.0.0' - flutter: ">=1.17.0" + flutter: ">=2.0.0" flutter: plugin: @@ -22,9 +22,8 @@ dependencies: functional_data: ^1.0.0 meta: ^1.3.0 pedantic: ^1.11.1 - reactive_ble_mobile: ^4.0.0 - reactive_ble_platform_interface: ^4.0.0 - + reactive_ble_mobile: ^4.0.1 + reactive_ble_platform_interface: ^4.0.1 dev_dependencies: build_runner: ^2.1.2 flutter_lints: ^1.0.3 diff --git a/packages/reactive_ble_mobile/CHANGELOG.md b/packages/reactive_ble_mobile/CHANGELOG.md index fb6c0d5a..db50cc53 100644 --- a/packages/reactive_ble_mobile/CHANGELOG.md +++ b/packages/reactive_ble_mobile/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.1 + +* Add support for iOS 15 + ## 4.0.0 * Initial Open Source release. diff --git a/packages/reactive_ble_mobile/pubspec.lock b/packages/reactive_ble_mobile/pubspec.lock index 20e1a09c..ad42d1a3 100644 --- a/packages/reactive_ble_mobile/pubspec.lock +++ b/packages/reactive_ble_mobile/pubspec.lock @@ -353,7 +353,7 @@ packages: name: reactive_ble_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" shelf: dependency: transitive description: diff --git a/packages/reactive_ble_mobile/pubspec.yaml b/packages/reactive_ble_mobile/pubspec.yaml index 41437a77..c1929432 100644 --- a/packages/reactive_ble_mobile/pubspec.yaml +++ b/packages/reactive_ble_mobile/pubspec.yaml @@ -1,18 +1,17 @@ name: reactive_ble_mobile description: Official Android and iOS implementation for the flutter_reactive_ble plugin. -version: 4.0.0 +version: 4.0.1 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0 <3.0.0" + flutter: ">=2.0.0" dependencies: flutter: sdk: flutter protobuf: ^2.0.0 - reactive_ble_platform_interface: ^4.0.0 - + reactive_ble_platform_interface: ^4.0.1 dev_dependencies: build_runner: ^2.1.2 flutter_test: diff --git a/packages/reactive_ble_platform_interface/CHANGELOG.md b/packages/reactive_ble_platform_interface/CHANGELOG.md index ce63509a..76cd596c 100644 --- a/packages/reactive_ble_platform_interface/CHANGELOG.md +++ b/packages/reactive_ble_platform_interface/CHANGELOG.md @@ -1,5 +1,9 @@ # Main releases +## 4.0.1 + +* Add support for iOS 15 + ## 4.0.0 * Initial Open Source release. diff --git a/packages/reactive_ble_platform_interface/pubspec.lock b/packages/reactive_ble_platform_interface/pubspec.lock index 50ab1a1b..e4d76998 100644 --- a/packages/reactive_ble_platform_interface/pubspec.lock +++ b/packages/reactive_ble_platform_interface/pubspec.lock @@ -480,4 +480,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.17.0" + flutter: ">=2.0.0" diff --git a/packages/reactive_ble_platform_interface/pubspec.yaml b/packages/reactive_ble_platform_interface/pubspec.yaml index e14473c4..d03a7012 100644 --- a/packages/reactive_ble_platform_interface/pubspec.yaml +++ b/packages/reactive_ble_platform_interface/pubspec.yaml @@ -1,11 +1,11 @@ name: reactive_ble_platform_interface description: Platform interface for the flutter_reactive_ble_project -version: 4.0.0 +version: 4.0.1 homepage: https://github.com/PhilipsHue/flutter_reactive_ble environment: sdk: '>=2.12.0 <3.0.0' - flutter: ">=1.17.0" + flutter: ">=2.0.0" dependencies: collection: ^1.15.0