From 844da4d8aea43aeda6ae93251eebf0dcb5592866 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 22 Jul 2021 11:54:24 -0400 Subject: [PATCH 1/4] Move plugin_platform_interface off legacy options --- packages/plugin_platform_interface/analysis_options.yaml | 1 - packages/plugin_platform_interface/pubspec.yaml | 2 +- .../test/plugin_platform_interface_test.dart | 3 +-- script/configs/custom_analysis.yaml | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 packages/plugin_platform_interface/analysis_options.yaml diff --git a/packages/plugin_platform_interface/analysis_options.yaml b/packages/plugin_platform_interface/analysis_options.yaml deleted file mode 100644 index cda4f6e153e6..000000000000 --- a/packages/plugin_platform_interface/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: ../../analysis_options_legacy.yaml diff --git a/packages/plugin_platform_interface/pubspec.yaml b/packages/plugin_platform_interface/pubspec.yaml index 2980a62ee998..66527bc58a61 100644 --- a/packages/plugin_platform_interface/pubspec.yaml +++ b/packages/plugin_platform_interface/pubspec.yaml @@ -24,5 +24,5 @@ dependencies: dev_dependencies: mockito: ^5.0.0 - test: ^1.16.0 pedantic: ^1.10.0 + test: ^1.16.0 diff --git a/packages/plugin_platform_interface/test/plugin_platform_interface_test.dart b/packages/plugin_platform_interface/test/plugin_platform_interface_test.dart index 0079765f0b09..967fa79d6dc3 100644 --- a/packages/plugin_platform_interface/test/plugin_platform_interface_test.dart +++ b/packages/plugin_platform_interface/test/plugin_platform_interface_test.dart @@ -3,9 +3,8 @@ // found in the LICENSE file. import 'package:mockito/mockito.dart'; -import 'package:test/test.dart'; - import 'package:plugin_platform_interface/plugin_platform_interface.dart'; +import 'package:test/test.dart'; class SamplePluginPlatform extends PlatformInterface { SamplePluginPlatform() : super(token: _token); diff --git a/script/configs/custom_analysis.yaml b/script/configs/custom_analysis.yaml index 2b0f844de7e0..4ff842779709 100644 --- a/script/configs/custom_analysis.yaml +++ b/script/configs/custom_analysis.yaml @@ -25,7 +25,6 @@ - integration_test - ios_platform_images - local_auth -- plugin_platform_interface - quick_actions - shared_preferences - url_launcher From 6cc1c8c46dfed4206d9b856ec41e92e4a4a8b1ba Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 22 Jul 2021 11:56:05 -0400 Subject: [PATCH 2/4] Move flutter_plugin_android_lifecycle off legacy options --- .../flutter_plugin_android_lifecycle/analysis_options.yaml | 1 - .../flutter_plugin_android_lifecycle_test.dart | 2 +- .../flutter_plugin_android_lifecycle/example/lib/main.dart | 2 +- .../flutter_plugin_android_lifecycle/example/pubspec.yaml | 4 ++-- script/configs/custom_analysis.yaml | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 packages/flutter_plugin_android_lifecycle/analysis_options.yaml diff --git a/packages/flutter_plugin_android_lifecycle/analysis_options.yaml b/packages/flutter_plugin_android_lifecycle/analysis_options.yaml deleted file mode 100644 index cda4f6e153e6..000000000000 --- a/packages/flutter_plugin_android_lifecycle/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: ../../analysis_options_legacy.yaml diff --git a/packages/flutter_plugin_android_lifecycle/example/integration_test/flutter_plugin_android_lifecycle_test.dart b/packages/flutter_plugin_android_lifecycle/example/integration_test/flutter_plugin_android_lifecycle_test.dart index 51f9a2537ffc..1d329a02f93b 100644 --- a/packages/flutter_plugin_android_lifecycle/example/integration_test/flutter_plugin_android_lifecycle_test.dart +++ b/packages/flutter_plugin_android_lifecycle/example/integration_test/flutter_plugin_android_lifecycle_test.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'package:flutter_plugin_android_lifecycle_example/main.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:flutter_plugin_android_lifecycle_example/main.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/flutter_plugin_android_lifecycle/example/lib/main.dart b/packages/flutter_plugin_android_lifecycle/example/lib/main.dart index c019590b2a7c..3ef6794dfad2 100644 --- a/packages/flutter_plugin_android_lifecycle/example/lib/main.dart +++ b/packages/flutter_plugin_android_lifecycle/example/lib/main.dart @@ -16,7 +16,7 @@ class MyApp extends StatelessWidget { appBar: AppBar( title: const Text('Sample flutter_plugin_android_lifecycle usage'), ), - body: Center( + body: const Center( child: Text( 'This plugin only provides Android Lifecycle API\n for other Android plugins.')), ), diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml index 6dc8d366e82b..0c88cd2c5531 100644 --- a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml @@ -17,10 +17,10 @@ dependencies: path: ../ dev_dependencies: - integration_test: - sdk: flutter flutter_test: sdk: flutter + integration_test: + sdk: flutter pedantic: ^1.8.0 flutter: diff --git a/script/configs/custom_analysis.yaml b/script/configs/custom_analysis.yaml index 4ff842779709..378714c40b1f 100644 --- a/script/configs/custom_analysis.yaml +++ b/script/configs/custom_analysis.yaml @@ -17,7 +17,6 @@ # https://github.com/flutter/flutter/issues/76229 - camera - file_selector -- flutter_plugin_android_lifecycle - google_maps_flutter - google_sign_in - image_picker From 08f813428e10b1d486aa9a7ccc380ba6d1f2e1e4 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 22 Jul 2021 11:58:28 -0400 Subject: [PATCH 3/4] Remove obsolete entry --- script/configs/custom_analysis.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/script/configs/custom_analysis.yaml b/script/configs/custom_analysis.yaml index 378714c40b1f..2e214757d90d 100644 --- a/script/configs/custom_analysis.yaml +++ b/script/configs/custom_analysis.yaml @@ -21,7 +21,6 @@ - google_sign_in - image_picker - in_app_purchase -- integration_test - ios_platform_images - local_auth - quick_actions From 4b36f801c17a8379ce6d4cac6f1ef421774f9306 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 23 Sep 2021 11:56:42 -0400 Subject: [PATCH 4/4] Remove cruft file --- packages/cross_file/analysis_options.yaml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packages/cross_file/analysis_options.yaml diff --git a/packages/cross_file/analysis_options.yaml b/packages/cross_file/analysis_options.yaml deleted file mode 100644 index cda4f6e153e6..000000000000 --- a/packages/cross_file/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: ../../analysis_options_legacy.yaml