[pull] master from flutter:master (#658)

* [connectivity_macos] move NNBD to stable (flutter#3588)

* [cross_file] Stable null safety release (flutter#3593)

* [shared_preferences] Bump platform versions to NNBD stable (flutter#3595)

* [url_launcher] Update platforms to NNBD stable (flutter#3584)

Updates all versions to stable.

Converts all desktop examples to null-safety, and migrates Linux and
macOS to use platform interface for examples rather than app-facing
package to eliminate circular dependencies (implementation copied
directly from Windows).

* [battery] Bump version for NNBD stable (flutter#3594)

Also replaces Mockito with test/Fake since the usage is a simple fake.

* [path_provider] Update to stable NNBD (flutter#3582)

Bumps the versions in the app-facing package to make it stable NNBD.

Changes the interface of four core methods to non-nullable, and adds a new exceptions if they aren't provided by the platform implementations. The list is somewhat arbitrary, but these seem like the four that are core enough that any implementation should either provide them, or explicitly say they don't have such a concept via UnsupportedError, since there isn't an obvious way for a developer to fall back if they are unexpectedly missing.

* [connectivity_macos] fix version (flutter#3599)

* [google_maps_flutter] Bump platform interface version for NNBD stable (flutter#3598)

* [device_info_platform_interface] null safety stable release (flutter#3597)

* [share] Bump version for NNBD stable (flutter#3600)

* [android_intent] Bump version for NNBD stable (flutter#3601)

* [shared_preferences] Bump app-facing version for NNBD stable (flutter#3602)

Co-authored-by: Chris Yang <ychris@google.com>
Co-authored-by: Maurits van Beusekom <maurits@baseflow.com>
Co-authored-by: stuartmorgan <stuartmorgan@google.com>

Author: 4 people

packages/android_intent/CHANGELOG.md

@@ -1,14 +1,8 @@
-## 2.0.0-nullsafety.2
-
-* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
-
-## 2.0.0-nullsafety.1
-
-* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
-
-## 2.0.0-nullsafety
+## 2.0.0
 
 * Migrate to null safety.
+* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))
+* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
 
 ## 0.3.7+8
 

packages/android_intent/example/integration_test/android_intent_test.dart

@@ -1,3 +1,9 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// @dart = 2.9
+
 import 'dart:io';
 
 import 'package:android_intent/android_intent.dart';

packages/android_intent/example/pubspec.yaml

@@ -17,12 +17,12 @@ dev_dependencies:
     path: ../../integration_test
   flutter_driver:
     sdk: flutter
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0
 
 # The following section is specific to Flutter.
 flutter:
   uses-material-design: true
 
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/android_intent/example/test_driver/integration_test.dart

@@ -1,3 +1,9 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// @dart = 2.9
+
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

packages/android_intent/pubspec.yaml

@@ -1,7 +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
-version: 2.0.0-nullsafety.2
+version: 2.0.0
 
 flutter:
   plugin:
@@ -13,15 +13,15 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  platform: ^3.0.0-nullsafety.4
-  meta: ^1.3.0-nullsafety.6
+  platform: ^3.0.0
+  meta: ^1.3.0
 dev_dependencies:
-  test: ^1.16.0-nullsafety.13
-  mockito: ^4.1.3
+  test: ^1.16.3
+  mockito: ^5.0.0-nullsafety.7
   flutter_test:
     sdk: flutter
-  pedantic: ^1.10.0-nullsafety.1
+  pedantic: ^1.10.0
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/battery/battery/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.0.0-nullsafety
+## 2.0.0
 
 * Migrate to null safety.
 

packages/battery/battery/example/pubspec.yaml

@@ -17,11 +17,11 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     path: ../../../integration_test
-  pedantic: ^1.10.0-nullsafety
+  pedantic: ^1.10.0
 
 flutter:
   uses-material-design: true
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/battery/battery/pubspec.yaml

@@ -2,7 +2,7 @@ name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
 homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery
-version: 2.0.0-nullsafety
+version: 2.0.0
 
 flutter:
   plugin:
@@ -16,18 +16,18 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  meta: ^1.3.0-nullsafety
-  battery_platform_interface: ^2.0.0-nullsafety
+  meta: ^1.3.0
+  battery_platform_interface: ^2.0.0
 
 dev_dependencies:
-  mockito: ^5.0.0-nullsafety.0
   flutter_test:
     sdk: flutter
-  plugin_platform_interface: ^1.1.0-nullsafety
+  plugin_platform_interface: ">=1.0.0 <3.0.0"
   integration_test:
     path: ../../integration_test
-  pedantic: ^1.10.0-nullsafety
+  pedantic: ^1.10.0
+  test: ^1.16.3
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <3.0.0"
   flutter: ">=1.12.13+hotfix.5"

packages/battery/battery/test/battery_test.dart

@@ -4,11 +4,11 @@
 
 import 'dart:async';
 
+import 'package:battery/battery.dart';
 import 'package:battery_platform_interface/battery_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
-import 'package:battery/battery.dart';
-import 'package:mockito/mockito.dart';
+import 'package:test/fake.dart';
 
 void main() {
   group('battery', () {
@@ -30,7 +30,7 @@ void main() {
   });
 }
 
-class MockBatteryPlatform extends Mock
+class MockBatteryPlatform extends Fake
     with MockPlatformInterfaceMixin
     implements BatteryPlatform {
   Future<int> batteryLevel() async {

packages/connectivity/connectivity_macos/CHANGELOG.md

@@ -1,14 +1,7 @@
-## 2.0.0-nullsafety
-
-* Update version to (semi-belatedly) meet 1.0-consistency promise.
-
-## 0.2.0-nullsafety.1
+## 0.2.0
 
 * Remove placeholder Dart file.
-
-## 0.2.0-nullsafety
-
-* Update Dart SDK constraint.
+* Update Dart SDK constraint for compatibility with null safety.
 
 ## 0.1.0+8