Merge branch 'master' into server-auth-code

Author: fbcouch

.cirrus.yml

@@ -14,10 +14,10 @@ task:
     - name: test+format
       install_script:
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main"
+        - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
         - sudo apt-get update
-        - sudo apt-get install -y --allow-unauthenticated clang-format-5.0
-      format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-5.0
+        - sudo apt-get install -y --allow-unauthenticated clang-format-7
+      format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
       test_script: ./script/incremental_build.sh test
     - name: analyze
       script: ./script/incremental_build.sh analyze
@@ -33,7 +33,7 @@ task:
 task:
   name: build-ipas
   osx_instance:
-    image: high-sierra-xcode-9.4
+    image: high-sierra-xcode-9.4.1
   env:
     PATH: $PATH:/usr/local/bin
     matrix:

AUTHORS

@@ -21,4 +21,5 @@ Ashton Thomas <[email protected]>
 Thomas Danner <[email protected]>
 Diego Velásquez <[email protected]>
 Hajime Nakamura <[email protected]>
+Tuyển Vũ Xuân <[email protected]>
 Twin Sun, LLC <[email protected]>

packages/android_alarm_manager/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

packages/android_alarm_manager/ios/Classes/AndroidAlarmManagerPlugin.h

@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FLTAndroidAlarmManagerPlugin : NSObject<FlutterPlugin>
+@interface FLTAndroidAlarmManagerPlugin : NSObject <FlutterPlugin>
 @end

packages/android_intent/example/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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

packages/android_intent/ios/Classes/AndroidIntentPlugin.h

@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FLTAndroidIntentPlugin : NSObject<FlutterPlugin>
+@interface FLTAndroidIntentPlugin : NSObject <FlutterPlugin>
 @end

packages/battery/example/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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

packages/battery/ios/Classes/BatteryPlugin.h

@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FLTBatteryPlugin : NSObject<FlutterPlugin>
+@interface FLTBatteryPlugin : NSObject <FlutterPlugin>
 @end

packages/battery/ios/Classes/BatteryPlugin.m

@@ -4,7 +4,7 @@
 
 #import "BatteryPlugin.h"
 
-@interface FLTBatteryPlugin ()<FlutterStreamHandler>
+@interface FLTBatteryPlugin () <FlutterStreamHandler>
 @end
 
 @implementation FLTBatteryPlugin {

packages/battery/pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
 dev_dependencies:
   async: ^2.0.8
   test: ^1.3.0
-  mockito: ^3.0.0
+  mockito: 3.0.0
   flutter_test:
     sdk: flutter