Merge remote-tracking branch 'upstream/master' into webview_load_file_android

Author: mvanbeusekom

analysis_options.yaml

@@ -57,6 +57,7 @@ analyzer:
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
+    - '**/*.pigeon.dart' # Pigeon generated file
 
 linter:
   rules:

analysis_options_legacy.yaml

@@ -5,6 +5,7 @@ analyzer:
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
+    - '**/*.pigeon.dart' # Pigeon generated file
   errors:
     always_require_non_null_named_parameters: false # not needed with nnbd
     # TODO(https://github.com/flutter/flutter/issues/74381):

packages/quick_actions/analysis_options.yaml

@@ -1,6 +1,7 @@
 ## NEXT
 
 * Updates Android compileSdkVersion to 31.
+* Updates code for analyzer changes.
 
 ## 0.6.0+8
 

packages/quick_actions/quick_actions/CHANGELOG.md

@@ -11,7 +11,7 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   testWidgets('Can set shortcuts', (WidgetTester tester) async {
-    final QuickActions quickActions = QuickActions();
+    const QuickActions quickActions = QuickActions();
     await quickActions.initialize(null);
 
     const ShortcutItem shortCutItem = ShortcutItem(

packages/quick_actions/quick_actions/example/integration_test/quick_actions_test.dart

@@ -19,13 +19,13 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: MyHomePage(),
+      home: const MyHomePage(),
     );
   }
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key? key}) : super(key: key);
+  const MyHomePage({Key? key}) : super(key: key);
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
@@ -38,7 +38,7 @@ class _MyHomePageState extends State<MyHomePage> {
   void initState() {
     super.initState();
 
-    final QuickActions quickActions = QuickActions();
+    const QuickActions quickActions = QuickActions();
     quickActions.initialize((String shortcutType) {
       setState(() {
         if (shortcutType != null) {
@@ -61,7 +61,7 @@ class _MyHomePageState extends State<MyHomePage> {
           type: 'action_two',
           localizedTitle: 'Action two',
           icon: 'ic_launcher'),
-    ]).then((value) {
+    ]).then((void _) {
       setState(() {
         if (shortcut == 'no action set') {
           shortcut = 'actions ready';
@@ -74,7 +74,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('$shortcut'),
+        title: Text(shortcut),
       ),
       body: const Center(
         child: Text('On home screen, long press the app icon to '

packages/quick_actions/quick_actions/example/lib/main.dart

@@ -23,25 +23,26 @@ void main() {
 
     test('initialize() PlatformInterface', () async {
       const QuickActions quickActions = QuickActions();
-      QuickActionHandler handler = (type) {};
+      final QuickActionHandler handler = (String type) {};
 
       await quickActions.initialize(handler);
       verify(QuickActionsPlatform.instance.initialize(handler)).called(1);
     });
 
     test('setShortcutItems() PlatformInterface', () {
       const QuickActions quickActions = QuickActions();
-      QuickActionHandler handler = (type) {};
+      final QuickActionHandler handler = (String type) {};
       quickActions.initialize(handler);
-      quickActions.setShortcutItems([]);
+      quickActions.setShortcutItems(<ShortcutItem>[]);
 
       verify(QuickActionsPlatform.instance.initialize(handler)).called(1);
-      verify(QuickActionsPlatform.instance.setShortcutItems([])).called(1);
+      verify(QuickActionsPlatform.instance.setShortcutItems(<ShortcutItem>[]))
+          .called(1);
     });
 
     test('clearShortcutItems() PlatformInterface', () {
       const QuickActions quickActions = QuickActions();
-      QuickActionHandler handler = (type) {};
+      final QuickActionHandler handler = (String type) {};
 
       quickActions.initialize(handler);
       quickActions.clearShortcutItems();
@@ -57,15 +58,15 @@ class MockQuickActionsPlatform extends Mock
     implements QuickActionsPlatform {
   @override
   Future<void> clearShortcutItems() async =>
-      super.noSuchMethod(Invocation.method(#clearShortcutItems, []));
+      super.noSuchMethod(Invocation.method(#clearShortcutItems, <Object?>[]));
 
   @override
   Future<void> initialize(QuickActionHandler? handler) async =>
-      super.noSuchMethod(Invocation.method(#initialize, [handler]));
+      super.noSuchMethod(Invocation.method(#initialize, <Object?>[handler]));
 
   @override
-  Future<void> setShortcutItems(List<ShortcutItem>? items) async =>
-      super.noSuchMethod(Invocation.method(#setShortcutItems, [items]));
+  Future<void> setShortcutItems(List<ShortcutItem>? items) async => super
+      .noSuchMethod(Invocation.method(#setShortcutItems, <Object?>[items]));
 }
 
 class MockQuickActions extends QuickActions {}

packages/quick_actions/quick_actions/test/quick_actions_test.dart

@@ -1,3 +1,7 @@
-# 1.0.0
+## NEXT
+
+* Updates code for analyzer changes.
+
+## 1.0.0
 
 * Initial release of quick_actions_platform_interface

packages/quick_actions/quick_actions_platform_interface/CHANGELOG.md

@@ -9,7 +9,7 @@ import 'package:quick_actions_platform_interface/types/types.dart';
 
 import '../platform_interface/quick_actions_platform.dart';
 
-final MethodChannel _channel =
+const MethodChannel _channel =
     MethodChannel('plugins.flutter.io/quick_actions');
 
 /// An implementation of [QuickActionsPlatform] that uses method channels.
@@ -22,7 +22,7 @@ class MethodChannelQuickActions extends QuickActionsPlatform {
   Future<void> initialize(QuickActionHandler handler) async {
     channel.setMethodCallHandler((MethodCall call) async {
       assert(call.method == 'launch');
-      handler(call.arguments);
+      handler(call.arguments as String);
     });
     final String? action =
         await channel.invokeMethod<String?>('getLaunchAction');

packages/quick_actions/quick_actions_platform_interface/lib/method_channel/method_channel_quick_actions.dart

@@ -40,16 +40,16 @@ abstract class QuickActionsPlatform extends PlatformInterface {
   ///
   /// Call this once before any further interaction with the plugin.
   Future<void> initialize(QuickActionHandler handler) async {
-    throw UnimplementedError("initialize() has not been implemented.");
+    throw UnimplementedError('initialize() has not been implemented.');
   }
 
   /// Sets the [ShortcutItem]s to become the app's quick actions.
   Future<void> setShortcutItems(List<ShortcutItem> items) async {
-    throw UnimplementedError("setShortcutItems() has not been implemented.");
+    throw UnimplementedError('setShortcutItems() has not been implemented.');
   }
 
   /// Removes all [ShortcutItem]s registered for the app.
   Future<void> clearShortcutItems() {
-    throw UnimplementedError("clearShortcutItems() has not been implemented.");
+    throw UnimplementedError('clearShortcutItems() has not been implemented.');
   }
 }

packages/quick_actions/quick_actions_platform_interface/lib/platform_interface/quick_actions_platform.dart

@@ -5,4 +5,4 @@
 /// Handler for a quick action launch event.
 ///
 /// The argument [type] corresponds to the [ShortcutItem]'s field.
-typedef void QuickActionHandler(String type);
+typedef QuickActionHandler = void Function(String type);

packages/quick_actions/quick_actions_platform_interface/lib/types/quick_action_handler.dart

@@ -13,7 +13,7 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   group('$MethodChannelQuickActions', () {
-    MethodChannelQuickActions quickActions = MethodChannelQuickActions();
+    final MethodChannelQuickActions quickActions = MethodChannelQuickActions();
 
     final List<MethodCall> log = <MethodCall>[];
 
@@ -29,9 +29,7 @@ void main() {
 
     group('#initialize', () {
       test('passes getLaunchAction on launch method', () {
-        quickActions.initialize((type) {
-          'launch';
-        });
+        quickActions.initialize((String type) {});
 
         expect(
           log,
@@ -59,19 +57,18 @@ void main() {
 
     group('#setShortCutItems', () {
       test('passes shortcutItem through channel', () {
-        quickActions.initialize((type) {
-          'launch';
-        });
-        quickActions.setShortcutItems([
-          ShortcutItem(type: 'test', localizedTitle: 'title', icon: 'icon.svg')
+        quickActions.initialize((String type) {});
+        quickActions.setShortcutItems(<ShortcutItem>[
+          const ShortcutItem(
+              type: 'test', localizedTitle: 'title', icon: 'icon.svg')
         ]);
 
         expect(
           log,
           <Matcher>[
             isMethodCall('getLaunchAction', arguments: null),
-            isMethodCall('setShortcutItems', arguments: [
-              {
+            isMethodCall('setShortcutItems', arguments: <Map<String, String>>[
+              <String, String>{
                 'type': 'test',
                 'localizedTitle': 'title',
                 'icon': 'icon.svg',
@@ -111,9 +108,7 @@ void main() {
 
     group('#clearShortCutItems', () {
       test('send clearShortcutItems through channel', () {
-        quickActions.initialize((type) {
-          'launch';
-        });
+        quickActions.initialize((String type) {});
         quickActions.clearShortcutItems();
 
         expect(

packages/quick_actions/quick_actions_platform_interface/test/method_channel_quick_actions_test.dart

@@ -5,6 +5,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:quick_actions_platform_interface/method_channel/method_channel_quick_actions.dart';
 import 'package:quick_actions_platform_interface/platform_interface/quick_actions_platform.dart';
+import 'package:quick_actions_platform_interface/types/types.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -31,11 +32,12 @@ void main() {
         'Default implementation of initialize() should throw unimplemented error',
         () {
       // Arrange
-      final QuickActionsPlatform = ExtendsQuickActionsPlatform();
+      final ExtendsQuickActionsPlatform quickActionsPlatform =
+          ExtendsQuickActionsPlatform();
 
       // Act & Assert
       expect(
-        () => QuickActionsPlatform.initialize((type) {}),
+        () => quickActionsPlatform.initialize((String type) {}),
         throwsUnimplementedError,
       );
     });
@@ -44,11 +46,12 @@ void main() {
         'Default implementation of setShortcutItems() should throw unimplemented error',
         () {
       // Arrange
-      final QuickActionsPlatform = ExtendsQuickActionsPlatform();
+      final ExtendsQuickActionsPlatform quickActionsPlatform =
+          ExtendsQuickActionsPlatform();
 
       // Act & Assert
       expect(
-        () => QuickActionsPlatform.setShortcutItems([]),
+        () => quickActionsPlatform.setShortcutItems(<ShortcutItem>[]),
         throwsUnimplementedError,
       );
     });
@@ -57,11 +60,12 @@ void main() {
         'Default implementation of clearShortcutItems() should throw unimplemented error',
         () {
       // Arrange
-      final QuickActionsPlatform = ExtendsQuickActionsPlatform();
+      final ExtendsQuickActionsPlatform quickActionsPlatform =
+          ExtendsQuickActionsPlatform();
 
       // Act & Assert
       expect(
-        () => QuickActionsPlatform.clearShortcutItems(),
+        () => quickActionsPlatform.clearShortcutItems(),
         throwsUnimplementedError,
       );
     });

packages/quick_actions/quick_actions_platform_interface/test/quick_actions_platform_interface_test.dart

@@ -1,4 +1,4 @@
-## NEXT
+## 6.0.16
 
 * Moves Android and iOS implementations to federated packages.
 

packages/url_launcher/url_launcher/CHANGELOG.md

@@ -3,10 +3,7 @@ description: Flutter plugin for launching a URL. Supports
   web, phone, SMS, and email schemes.
 repository: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
-version: 6.0.15
-# Temporarily disable publishing to allow moving Android and iOS
-# implementations.
-publish_to: none
+version: 6.0.16
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -32,11 +29,8 @@ dependencies:
   flutter:
     sdk: flutter
   meta: ^1.3.0
-  # Temporary path dependencies to allow moving Android and iOS implementations.
-  url_launcher_android:
-    path: ../url_launcher_android
-  url_launcher_ios:
-    path: ../url_launcher_ios
+  url_launcher_android: ^6.0.13
+  url_launcher_ios: ^6.0.13
   url_launcher_linux: ^2.0.0
   url_launcher_macos: ^2.0.0
   url_launcher_platform_interface: ^2.0.3

packages/url_launcher/url_launcher/pubspec.yaml

@@ -1,6 +1,7 @@
 ## 2.4.0
 
 * Adds support for Android's `WebView.loadData` and `WebView.loadDataWithBaseUrl` methods and implements the `loadFile` and `loadHtmlString` methods from the platform interface.
+* Updates to webview_flutter_platform_interface version 1.5.2.
 
 ## 2.3.1
 

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -590,7 +590,7 @@ class WebViewController {
     bool? hasNavigationDelegate;
     bool? hasProgressTracking;
     bool? debuggingEnabled;
-    WebSetting<String?> userAgent = WebSetting<String?>.absent();
+    WebSetting<String?> userAgent = const WebSetting<String?>.absent();
     bool? zoomEnabled;
     if (currentValue.javascriptMode != newValue.javascriptMode) {
       javascriptMode = newValue.javascriptMode;

packages/webview_flutter/webview_flutter_android/example/lib/web_view.dart

@@ -19,7 +19,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  webview_flutter_platform_interface: ^1.5.1
+  webview_flutter_platform_interface: ^1.5.2
 
 dev_dependencies:
   build_runner: ^2.1.4