Merge branch 'master' into add_zoom_to_android_webview

* master:
  Fix test exclusion logic for nnbd plugins (flutter#3342)
  [camera] Zoom functionality for Android and iOS (flutter#3315)
  Add implementation of didFinishProcessingPhoto callback (flutter#3337)
  [camera] Flash functionality for Android and iOS (flutter#3314)

# Conflicts:
#	packages/webview_flutter/CHANGELOG.md
#	packages/webview_flutter/example/pubspec.yaml

Author: NickalasB

.cirrus.yml

@@ -39,8 +39,16 @@ task:
         - flutter channel $CHANNEL
         - ./script/incremental_build.sh test
     - name: analyze
+      env:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
       script: ./script/incremental_build.sh analyze
     - name: build_all_plugins_apk
+      env:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
         # https://github.com/flutter/flutter/issues/42864
@@ -144,6 +152,10 @@ task:
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
+      env:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
         # https://github.com/flutter/flutter/issues/42864

packages/android_intent/test/android_intent_test.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @dart = 2.9
+
 import 'package:android_intent/flag.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -11,7 +13,8 @@ import 'package:platform/platform.dart';
 
 void main() {
   AndroidIntent androidIntent;
-  late MockMethodChannel mockChannel;
+  MockMethodChannel mockChannel;
+
   setUp(() {
     mockChannel = MockMethodChannel();
     when(mockChannel.invokeMethod<bool>('canResolveActivity', any))

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.6.2
+
+* Add zoom support for Android and iOS implementations.
+
+## 0.6.1+1
+
+* Added implementation of the `didFinishProcessingPhoto` on iOS which allows saving image metadata (EXIF) on iOS 11 and up.
+
+## 0.6.1
+
+* Add flash support for Android and iOS implementations.
+
 ## 0.6.0+2
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))

packages/camera/camera/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
     }
 }
 
@@ -40,16 +40,16 @@ android {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
     }
-    dependencies {
-        implementation 'androidx.annotation:annotation:1.0.0'
-        implementation 'androidx.core:core:1.0.0'
-    }
     testOptions {
+        unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
     }
 }
 
 dependencies {
+    compileOnly 'androidx.annotation:annotation:1.1.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.5.13'
+    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation 'org.robolectric:robolectric:4.3'
 }