Merge branch 'master' of https://github.com/pauldemarco/flutter_blue into pauldemarco-master

# Conflicts:
#	CHANGELOG.md
#	README.md
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/src/main/java/com/pauldemarco/flutter_blue/FlutterBluePlugin.java
#	example/android/app/src/main/java/com/pauldemarco/flutter_blue_example/MainActivity.java
#	example/android/gradle/wrapper/gradle-wrapper.properties
#	example/ios/Podfile
#	example/ios/Runner.xcodeproj/project.pbxproj
#	example/lib/main.dart
#	ios/flutter_blue.podspec
#	lib/gen/flutterblue.pb.dart
#	lib/gen/flutterblue.pbjson.dart
#	lib/src/bluetooth_device.dart
#	pubspec.yaml

Author: TwoSX

.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: f53b32eb2317ba09137969999d130c24a6314997
+  channel: master
+
+project_type: plugin

CHANGELOG.md

@@ -1,22 +1,39 @@
+## 0.7.2
+* Add `allowDuplicates` option to `startScan`.
+* Fix performance issue with GUID initializers.
+
+## 0.7.1+1
+* Fix for FlutterBlue constructor when running on emulator.
+* Return error when attempting to `discoverServices` while not connected.
+
+## 0.7.1
+* Fix incorrect value notification when write is performed.
+* Add `toString` to each bluetooth class.
+* Various other bug fixes.
+
+## 0.7.0
+* Support v2 android embedding.
+* Various bug and documentation fixes.
+
 ## 0.6.3+1
-* Fix compilation issue with iOS
-* Bump protobuf version to 1.0.0
+* Fix compilation issue with iOS.
+* Bump protobuf version to 1.0.0.
 
 ## 0.6.3
-* Update project files for Android and iOS
-* Remove dependency on protoc for iOS
+* Update project files for Android and iOS.
+* Remove dependency on protoc for iOS.
 
 ## 0.6.2
-* Add `mtu` and `requestMtu` to BluetoothDevice
+* Add `mtu` and `requestMtu` to BluetoothDevice.
 
 ## 0.6.0+4
 * Fix duplicate characteristic notifications when connection lost.
 * Fix duplicate characteristic notifications when reconnecting.
 * Add minimum SDK version of 18 for the plugin.
-* Documentation updates
+* Documentation updates.
 
 ## 0.6.0
-* **Breaking change**. API refactoring with RxDart (see example)
+* **Breaking change**. API refactoring with RxDart (see example).
 * Log a more detailed warning at build time about the previous AndroidX migration.
 * Ensure that all channel calls to the Dart side from the Java side are done on the UI thread.
   This change allows Transactions to work with upcoming Engine restrictions, which require
@@ -31,14 +48,14 @@
   using the original support library.
 
 ## 0.4.2+1
-* Upgrade Android Gradle plugin to 3.3.0
-* Refresh iOS build files
+* Upgrade Android Gradle plugin to 3.3.0.
+* Refresh iOS build files.
 
 ## 0.4.2
-* Set the verbosity of log messages with `setLogLevel`
-* Updated iOS and Android project files
-* `autoConnect` now configurable for Android
-* Various bug fixes
+* Set the verbosity of log messages with `setLogLevel`.
+* Updated iOS and Android project files.
+* `autoConnect` now configurable for Android.
+* Various bug fixes.
 
 ## 0.4.1
 * Fixed bug where setNotifyValue wasn't properly awaitable.
@@ -52,28 +69,28 @@
 * Various other bug fixes.
 
 ## 0.3.4
-* Updated to use the latest protobuf (^0.9.0+1)
-* Updated other dependencies
+* Updated to use the latest protobuf (^0.9.0+1).
+* Updated other dependencies.
 
 ## 0.3.3
-* `scan` `withServices` to filter by service UUID's (iOS)
-* Error handled when trying to scan with adapter off (Android)
+* `scan` `withServices` to filter by service UUID's (iOS).
+* Error handled when trying to scan with adapter off (Android).
 
 ## 0.3.2
-* Runtime permissions for Android
-* `scan` `withServices` to filter by service UUID's (Android)
-* Scan mode can be specified (Android)
-* Now targets the latest android SDK
-* Dart 2 compatibility
+* Runtime permissions for Android.
+* `scan` `withServices` to filter by service UUID's (Android).
+* Scan mode can be specified (Android).
+* Now targets the latest android SDK.
+* Dart 2 compatibility.
 
 ## 0.3.1
-* Now allows simultaneous notifications of characteristics
-* Fixed bug on iOS that was returning `discoverServices` too early
+* Now allows simultaneous notifications of characteristics.
+* Fixed bug on iOS that was returning `discoverServices` too early.
 
 ## 0.3.0
-* iOS support added
-* Bug fixed in example causing discoverServices to be called multiple times
-* Various other bug fixes
+* iOS support added.
+* Bug fixed in example causing discoverServices to be called multiple times.
+* Various other bug fixes.
 
 ## 0.2.4
 * **Breaking change**. Upgraded to Gradle 4.1 and Android Studio Gradle plugin
@@ -86,26 +103,26 @@
 
 ## 0.2.2
 * **Breaking changes**:
-* `startScan` renamed to `scan`
-* `ScanResult` now returns a `BluetoothDevice`
-* `connect` now takes a `BluetoothDevice` and returns Stream<BluetoothDeviceState>
-* Added parameter `timeout` to `connect`
-* Automatic disconnect on deviceConnection.cancel()
+* `startScan` renamed to `scan`.
+* `ScanResult` now returns a `BluetoothDevice`.
+* `connect` now takes a `BluetoothDevice` and returns Stream<BluetoothDeviceState>.
+* Added parameter `timeout` to `connect`.
+* Automatic disconnect on deviceConnection.cancel().
 
 ## 0.2.1
-* **Breaking change**. Removed `stopScan` from API, use `scanSubscription.cancel()` instead
-* Automatically stops scan when `startScan` subscription is canceled (thanks to @brianegan)
-* Added `timeout` parameter to `startScan`
-* Updated example app to show new scan functionality
+* **Breaking change**. Removed `stopScan` from API, use `scanSubscription.cancel()` instead.
+* Automatically stops scan when `startScan` subscription is canceled (thanks to @brianegan).
+* Added `timeout` parameter to `startScan`.
+* Updated example app to show new scan functionality.
 
 ## 0.2.0
 
-* Added state and onStateChanged for BluetoothDevice
-* Updated example to show new functionality
+* Added state and onStateChanged for BluetoothDevice.
+* Updated example to show new functionality.
 
 ## 0.1.1
 
-* Fixed image for pub.dartlang.org
+* Fixed image for pub.dartlang.org.
 
 ## 0.1.0
 

README.md

@@ -38,10 +38,11 @@ FlutterBlue flutterBlue = FlutterBlue.instance;
 flutterBlue.startScan(timeout: Duration(seconds: 4));
 
 // Listen to scan results
-var subscription = flutterBlue.scanResults.listen((scanResult) {
-    // do something with scan result
-    device = scanResult.device;
-    print('${device.name} found! rssi: ${scanResult.rssi}');
+var subscription = flutterBlue.scanResults.listen((results) {
+    // do something with scan results
+    for (ScanResult r in results) {
+        print('${r.device.name} found! rssi: ${r.rssi}');
+    }
 });
 
 // Stop scanning
@@ -104,7 +105,7 @@ characteristic.value.listen((value) {
 final mtu = await device.mtu.first;
 await device.requestMtu(512);
 ```
-Note that iOS will not allow that you request the MTU size, but will always try to negotiate the highest possible MTU (iOS supports up to MTU size 185)
+Note that iOS will not allow requests of MTU size, and will always try to negotiate the highest possible MTU (iOS supports up to MTU size 185)
 
 ## Reference
 ### FlutterBlue API

android/build.gradle

@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
     }
 }
@@ -78,5 +78,6 @@ protobuf {
 
 dependencies {
     implementation 'com.google.protobuf:protobuf-lite:3.0.1'
-    implementation 'androidx.core:core:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.core:core:1.0.1'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-5.6.4-all.zip

android/src/main/AndroidManifest.xml

@@ -2,5 +2,5 @@
   package="com.pauldemarco.flutter_blue">
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 </manifest>