Merge branch 'master' into android-agp-update

Author: ened

.gitignore

@@ -69,4 +69,6 @@ Flutter.podspec
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+pubspec_overrides.yaml

README.md

@@ -11,7 +11,7 @@ Feel free to open an new issue or a pull request to make this project better
 
 This project uses melos to manage all the packages inside this repo.
 
-Install melos: `dart pub global activate melos 2.9.0`
+Install melos: `dart pub global activate melos`
 Setup melos to point to the dependencies in your local folder: `melos bootstrap`
 
 ### Android

bin/quality_checks.sh

@@ -4,7 +4,7 @@ echo 'export PATH="$PATH":"$FLUTTER_ROOT/.pub-cache/bin"' >>~/.bashrc
 echo 'export PATH="$PATH":"$FLUTTER_ROOT/bin"' >>~/.bashrc 
 source ~/.bashrc
 
-dart pub global activate melos 2.9.0
+dart pub global activate melos
 
 melos bootstrap
 melos run analyze

example/pubspec.yaml

@@ -4,7 +4,7 @@ version: 5.1.1
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
   flutter: ">=1.10.0"
 
 dependencies:
@@ -24,13 +24,5 @@ dev_dependencies:
     sdk: flutter
   functional_data_generator: ^1.1.2
 
-dependency_overrides:
-  flutter_reactive_ble:
-    path: ../packages/flutter_reactive_ble
-  reactive_ble_mobile:
-    path: ../packages/reactive_ble_mobile
-  reactive_ble_platform_interface:
-    path: ../packages/reactive_ble_platform_interface
-
 flutter:
   uses-material-design: true

melos.yaml

@@ -1,6 +1,7 @@
 name: flutter_reactive_ble
 packages:
-  - /**
+  - packages/*
+  - example
 scripts:
   analyze: melos exec -- flutter analyze
 
@@ -21,4 +22,4 @@ scripts:
 
   generate:flutter:
     run: melos exec -c 1 --depends-on="build_runner" --flutter -- "flutter pub run build_runner build --delete-conflicting-outputs"
-    description: Build all generated files for Flutter packages in this project.
+    description: Build all generated files for Flutter packages in this project.

packages/flutter_reactive_ble/lib/src/discovered_devices_registry.dart

@@ -18,8 +18,7 @@ abstract class DiscoveredDevicesRegistry {
 class DiscoveredDevicesRegistryImpl implements DiscoveredDevicesRegistry {
   DiscoveredDevicesRegistryImpl({required this.getTimestamp});
 
-  DiscoveredDevicesRegistryImpl.standard()
-      : this(getTimestamp: () => DateTime.now());
+  DiscoveredDevicesRegistryImpl.standard() : this(getTimestamp: DateTime.now);
 
   @override
   final DateTime Function() getTimestamp;

packages/flutter_reactive_ble/pubspec.yaml

@@ -4,7 +4,7 @@ version: 5.1.1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
   flutter: ">=2.0.0"
 
 flutter:

packages/reactive_ble_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ version: 5.1.1
 homepage: https://github.com/PhilipsHue/flutter_reactive_ble
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
   flutter: ">=2.0.0"
 
 dependencies: