Merge branch 'master' into add_zoom_to_android_webview

* master:
  [android_intent] Migrate to nnbd (flutter#3328)
  [share] Migrate to null-safety (flutter#3311)
  [webview_flutter] Migrate to nnbd (flutter#3327)

# Conflicts:
#	packages/webview_flutter/CHANGELOG.md
#	packages/webview_flutter/lib/platform_interface.dart
#	packages/webview_flutter/lib/webview_flutter.dart
#	packages/webview_flutter/pubspec.yaml
#	packages/webview_flutter/test/webview_flutter_test.dart

Author: NickalasB

packages/android_intent/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety
+
+* Migrate to null safety.
+
 ## 0.3.7+8
 
 * Update Flutter SDK constraint.

packages/android_intent/lib/android_intent.dart

@@ -36,7 +36,7 @@ class AndroidIntent {
     this.arguments,
     this.package,
     this.componentName,
-    Platform platform,
+    Platform? platform,
     this.type,
   })  : assert(action != null || componentName != null,
             'action or component (or both) must be specified'),
@@ -47,8 +47,8 @@ class AndroidIntent {
   /// app code, it may break without warning.
   @visibleForTesting
   AndroidIntent.private({
-    @required Platform platform,
-    @required MethodChannel channel,
+    required Platform platform,
+    required MethodChannel channel,
     this.action,
     this.flags,
     this.category,
@@ -66,47 +66,47 @@ class AndroidIntent {
   /// includes constants like `ACTION_VIEW`.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#intent-structure.
-  final String action;
+  final String? action;
 
   /// Constants that can be set on an intent to tweak how it is finally handled.
   /// Some of the constants are mirrored to Dart via [Flag].
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#setFlags(int).
-  final List<int> flags;
+  final List<int>? flags;
 
   /// An optional additional constant qualifying the given [action].
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#intent-structure.
-  final String category;
+  final String? category;
 
   /// The Uri that the [action] is pointed towards.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#intent-structure.
-  final String data;
+  final String? data;
 
   /// The equivalent of `extras`, a generic `Bundle` of data that the Intent can
   /// carry. This is a slot for extraneous data that the listener may use.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#intent-structure.
-  final Map<String, dynamic> arguments;
+  final Map<String, dynamic>? arguments;
 
   /// Sets the [data] to only resolve within this given package.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#setPackage(java.lang.String).
-  final String package;
+  final String? package;
 
   /// Set the exact `ComponentName` that should handle the intent. If this is
   /// set [package] should also be non-null.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#setComponent(android.content.ComponentName).
-  final String componentName;
+  final String? componentName;
   final MethodChannel _channel;
   final Platform _platform;
 
   /// Set an explicit MIME data type.
   ///
   /// See https://developer.android.com/reference/android/content/Intent.html#intent-structure.
-  final String type;
+  final String? type;
 
   bool _isPowerOfTwo(int x) {
     /* First x in the below expression is for the case when x is 0 */
@@ -146,17 +146,18 @@ class AndroidIntent {
       return false;
     }
 
-    return await _channel.invokeMethod<bool>(
+    final result = await _channel.invokeMethod<bool>(
       'canResolveActivity',
       _buildArguments(),
     );
+    return result!;
   }
 
   /// Constructs the map of arguments which is passed to the plugin.
   Map<String, dynamic> _buildArguments() {
     return {
       if (action != null) 'action': action,
-      if (flags != null) 'flags': convertFlags(flags),
+      if (flags != null) 'flags': convertFlags(flags!),
       if (category != null) 'category': category,
       if (data != null) 'data': data,
       if (arguments != null) 'arguments': arguments,

packages/android_intent/pubspec.yaml

@@ -1,10 +1,7 @@
 name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-# 0.3.y+z is compatible with 1.0.0, if you land a breaking change bump
-# the version to 2.0.0.
-# See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.3.7+8
+version: 2.0.0-nullsafety
 
 flutter:
   plugin:
@@ -16,15 +13,15 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  platform: ">=2.0.0 <4.0.0"
-  meta: ^1.0.5
+  platform: ^3.0.0-nullsafety.4
+  meta: ^1.3.0-nullsafety.6
 dev_dependencies:
-  test: ^1.3.0
-  mockito: ^3.0.0
+  test: ^1.16.0-nullsafety.13
+  mockito: ^4.1.3
   flutter_test:
     sdk: flutter
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0-nullsafety.1
 
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/android_intent/test/android_intent_test.dart

@@ -11,9 +11,11 @@ import 'package:platform/platform.dart';
 
 void main() {
   AndroidIntent androidIntent;
-  MockMethodChannel mockChannel;
+  late MockMethodChannel mockChannel;
   setUp(() {
     mockChannel = MockMethodChannel();
+    when(mockChannel.invokeMethod<bool>('canResolveActivity', any))
+        .thenAnswer((realInvocation) async => true);
   });
 
   group('AndroidIntent', () {

packages/share/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety
+
+* Migrate to null safety.
+
 ## 0.6.5+5
 
 * Update Flutter SDK constraint.

packages/share/lib/share.dart

@@ -33,8 +33,8 @@ class Share {
   /// from [MethodChannel].
   static Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) {
     assert(text != null);
     assert(text.isNotEmpty);
@@ -67,10 +67,10 @@ class Share {
   /// from [MethodChannel].
   static Future<void> shareFiles(
     List<String> paths, {
-    List<String> mimeTypes,
-    String subject,
-    String text,
-    Rect sharePositionOrigin,
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
   }) {
     assert(paths != null);
     assert(paths.isNotEmpty);

packages/share/pubspec.yaml

@@ -2,10 +2,7 @@ name: share
 description: Flutter plugin for sharing content via the platform share UI, using
   the ACTION_SEND intent on Android and UIActivityViewController on iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/share
-# 0.6.y+z is compatible with 1.0.0, if you land a breaking change bump
-# the version to 2.0.0.
-# See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.6.5+5
+version: 2.0.0-nullsafety
 
 flutter:
   plugin:
@@ -17,20 +14,20 @@ flutter:
         pluginClass: FLTSharePlugin
 
 dependencies:
-  meta: ^1.0.5
-  mime: ^0.9.7
+  meta: ^1.3.0-nullsafety.6
+  mime: ^1.0.0-nullsafety.0
   flutter:
     sdk: flutter
 
 dev_dependencies:
-  test: ^1.3.0
-  mockito: ^3.0.0
+  test: ^1.16.0-nullsafety.13
+  mockito: ^4.1.3
   flutter_test:
     sdk: flutter
   integration_test:
     path: ../integration_test
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0-nullsafety.3
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5"
+  sdk: ">=2.12.0-0 <3.0.0"

packages/share/test/share_test.dart

@@ -15,7 +15,7 @@ import 'package:flutter/services.dart';
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  MockMethodChannel mockChannel;
+  late MockMethodChannel mockChannel;
 
   setUp(() {
     mockChannel = MockMethodChannel();
@@ -26,14 +26,6 @@ void main() {
     });
   });
 
-  test('sharing null fails', () {
-    expect(
-      () => Share.share(null),
-      throwsA(const TypeMatcher<AssertionError>()),
-    );
-    verifyZeroInteractions(mockChannel);
-  });
-
   test('sharing empty fails', () {
     expect(
       () => Share.share(''),
@@ -58,14 +50,6 @@ void main() {
     }));
   });
 
-  test('sharing null file fails', () {
-    expect(
-      () => Share.shareFiles([null]),
-      throwsA(const TypeMatcher<AssertionError>()),
-    );
-    verifyZeroInteractions(mockChannel);
-  });
-
   test('sharing empty file fails', () {
     expect(
       () => Share.shareFiles(['']),

packages/webview_flutter/CHANGELOG.md

@@ -1,6 +1,6 @@
-## 1.0.9
+## 2.0.0-nullsafety
 
-* Enable native double-tap to zoom, and pinch to zoom functionality on Android and default to setLoadWithOverviewMode
+* Migration to null-safety.
 
 ## 1.0.8