From 15c500e57124aa450799f15f61e578e940360049 Mon Sep 17 00:00:00 2001 From: Hakkyu Kim Date: Mon, 8 Nov 2021 12:54:01 +0900 Subject: [PATCH 1/2] Migrate plug plugins to use flutter_lints --- analysis_options_plus.yaml | 7 ++----- packages/battery_plus/example/pubspec.yaml | 2 +- packages/battery_plus/pubspec.yaml | 2 +- packages/connectivity_plus/example/lib/main.dart | 11 +++++++---- packages/connectivity_plus/example/pubspec.yaml | 2 +- packages/connectivity_plus/pubspec.yaml | 2 +- packages/device_info_plus/example/lib/main.dart | 9 ++++++--- packages/device_info_plus/example/pubspec.yaml | 2 +- packages/device_info_plus/pubspec.yaml | 2 +- packages/network_info_plus/example/pubspec.yaml | 2 +- packages/network_info_plus/pubspec.yaml | 2 +- .../integration_test/package_info_plus_test.dart | 2 +- packages/package_info_plus/example/lib/main.dart | 8 +++++--- packages/package_info_plus/example/pubspec.yaml | 2 +- packages/package_info_plus/pubspec.yaml | 2 +- packages/sensors_plus/example/lib/main.dart | 8 +++++--- packages/sensors_plus/example/lib/snake.dart | 4 +++- packages/sensors_plus/example/pubspec.yaml | 2 +- packages/sensors_plus/pubspec.yaml | 2 +- packages/share_plus/example/lib/image_previews.dart | 4 ++-- packages/share_plus/example/lib/main.dart | 8 +++++--- packages/share_plus/example/pubspec.yaml | 2 +- packages/share_plus/pubspec.yaml | 2 +- 23 files changed, 50 insertions(+), 39 deletions(-) diff --git a/analysis_options_plus.yaml b/analysis_options_plus.yaml index af9ff1672..447606ec6 100644 --- a/analysis_options_plus.yaml +++ b/analysis_options_plus.yaml @@ -1,10 +1,8 @@ # This file was copied from plus_plugins/analysis_options.yaml. -include: package:pedantic/analysis_options.yaml +include: package:flutter_lints/flutter.yaml analyzer: - enable-experiment: - - non-nullable exclude: # Ignore generated files - '**/*.g.dart' @@ -12,6 +10,5 @@ analyzer: linter: rules: - public_member_api_docs: true prefer_final_in_for_each: true - prefer_final_locals: true \ No newline at end of file + prefer_final_locals: true diff --git a/packages/battery_plus/example/pubspec.yaml b/packages/battery_plus/example/pubspec.yaml index 06617a85a..bbfa8a0e7 100644 --- a/packages/battery_plus/example/pubspec.yaml +++ b/packages/battery_plus/example/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/battery_plus/pubspec.yaml b/packages/battery_plus/pubspec.yaml index eba633950..8f9395f6a 100644 --- a/packages/battery_plus/pubspec.yaml +++ b/packages/battery_plus/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: sdk: flutter dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/connectivity_plus/example/lib/main.dart b/packages/connectivity_plus/example/lib/main.dart index b707a7514..7e5fbc970 100644 --- a/packages/connectivity_plus/example/lib/main.dart +++ b/packages/connectivity_plus/example/lib/main.dart @@ -5,6 +5,7 @@ // ignore_for_file: public_member_api_docs import 'dart:async'; +import 'dart:developer' as developer; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/foundation.dart'; @@ -12,11 +13,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; void main() { - runApp(MyApp()); + runApp(const MyApp()); } class MyApp extends StatelessWidget { // This widget is the root of your application. + const MyApp({Key? key}) : super(key: key); + @override Widget build(BuildContext context) { return MaterialApp( @@ -24,13 +27,13 @@ class MyApp extends StatelessWidget { theme: ThemeData( primarySwatch: Colors.blue, ), - home: MyHomePage(title: 'Flutter Demo Home Page'), + home: const MyHomePage(title: 'Flutter Demo Home Page'), ); } } class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, required this.title}) : super(key: key); + const MyHomePage({Key? key, required this.title}) : super(key: key); final String title; @@ -65,7 +68,7 @@ class _MyHomePageState extends State { try { result = await _connectivity.checkConnectivity(); } on PlatformException catch (e) { - print(e.toString()); + developer.log(e.toString()); return; } diff --git a/packages/connectivity_plus/example/pubspec.yaml b/packages/connectivity_plus/example/pubspec.yaml index f14fc929d..c596c2917 100644 --- a/packages/connectivity_plus/example/pubspec.yaml +++ b/packages/connectivity_plus/example/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/pubspec.yaml index 9909f42d0..505763858 100644 --- a/packages/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: sdk: flutter dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/device_info_plus/example/lib/main.dart b/packages/device_info_plus/example/lib/main.dart index 349b8f0ac..3679bd130 100644 --- a/packages/device_info_plus/example/lib/main.dart +++ b/packages/device_info_plus/example/lib/main.dart @@ -6,6 +6,7 @@ // ignore_for_file: public_member_api_docs import 'dart:async'; +import 'dart:developer' as developer; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -13,14 +14,16 @@ import 'package:device_info_plus_tizen/device_info_plus_tizen.dart'; void main() { runZonedGuarded(() { - runApp(MyApp()); + runApp(const MyApp()); }, (dynamic error, dynamic stack) { - print(error); - print(stack); + developer.log(error); + developer.log(stack); }); } class MyApp extends StatefulWidget { + const MyApp({Key? key}) : super(key: key); + @override _MyAppState createState() => _MyAppState(); } diff --git a/packages/device_info_plus/example/pubspec.yaml b/packages/device_info_plus/example/pubspec.yaml index 5fab47862..05d808270 100644 --- a/packages/device_info_plus/example/pubspec.yaml +++ b/packages/device_info_plus/example/pubspec.yaml @@ -17,7 +17,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/device_info_plus/pubspec.yaml b/packages/device_info_plus/pubspec.yaml index a907383ce..1667184ba 100644 --- a/packages/device_info_plus/pubspec.yaml +++ b/packages/device_info_plus/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: sdk: flutter dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/packages/network_info_plus/example/pubspec.yaml b/packages/network_info_plus/example/pubspec.yaml index 8365907d7..a4540fe41 100644 --- a/packages/network_info_plus/example/pubspec.yaml +++ b/packages/network_info_plus/example/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/network_info_plus/pubspec.yaml b/packages/network_info_plus/pubspec.yaml index 9bb8fb015..2604e81ab 100644 --- a/packages/network_info_plus/pubspec.yaml +++ b/packages/network_info_plus/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: network_info_plus_platform_interface: ^1.1.0 dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/package_info_plus/example/integration_test/package_info_plus_test.dart b/packages/package_info_plus/example/integration_test/package_info_plus_test.dart index 0b3990764..df90abdf5 100644 --- a/packages/package_info_plus/example/integration_test/package_info_plus_test.dart +++ b/packages/package_info_plus/example/integration_test/package_info_plus_test.dart @@ -21,7 +21,7 @@ void main() { }); testWidgets('example', (WidgetTester tester) async { - await tester.pumpWidget(MyApp()); + await tester.pumpWidget(const MyApp()); await tester.pumpAndSettle(); expect(find.text('package_info_plus_tizen_example'), findsOneWidget); expect( diff --git a/packages/package_info_plus/example/lib/main.dart b/packages/package_info_plus/example/lib/main.dart index 185d2aaf7..480c45adf 100644 --- a/packages/package_info_plus/example/lib/main.dart +++ b/packages/package_info_plus/example/lib/main.dart @@ -10,22 +10,24 @@ import 'package:flutter/material.dart'; import 'package:package_info_plus/package_info_plus.dart'; void main() { - runApp(MyApp()); + runApp(const MyApp()); } class MyApp extends StatelessWidget { + const MyApp({Key? key}) : super(key: key); + @override Widget build(BuildContext context) { return MaterialApp( title: 'PackageInfo Demo', theme: ThemeData(primarySwatch: Colors.blue), - home: MyHomePage(title: 'PackageInfo example app'), + home: const MyHomePage(title: 'PackageInfo example app'), ); } } class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, this.title}) : super(key: key); + const MyHomePage({Key? key, this.title}) : super(key: key); final String? title; diff --git a/packages/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/example/pubspec.yaml index 7cdc54693..8af6cc768 100644 --- a/packages/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/example/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/package_info_plus/pubspec.yaml b/packages/package_info_plus/pubspec.yaml index 59f2d0cc5..edc7b4333 100644 --- a/packages/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: package_info_plus_platform_interface: ^1.0.2 dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/sensors_plus/example/lib/main.dart b/packages/sensors_plus/example/lib/main.dart index fb33a4a12..9f69200b9 100644 --- a/packages/sensors_plus/example/lib/main.dart +++ b/packages/sensors_plus/example/lib/main.dart @@ -11,10 +11,12 @@ import 'package:sensors_plus/sensors_plus.dart'; import 'snake.dart'; void main() { - runApp(MyApp()); + runApp(const MyApp()); } class MyApp extends StatelessWidget { + const MyApp({Key? key}) : super(key: key); + @override Widget build(BuildContext context) { return MaterialApp( @@ -22,13 +24,13 @@ class MyApp extends StatelessWidget { theme: ThemeData( primarySwatch: Colors.blue, ), - home: MyHomePage(title: 'Flutter Demo Home Page'), + home: const MyHomePage(title: 'Flutter Demo Home Page'), ); } } class MyHomePage extends StatefulWidget { - MyHomePage({Key? key, this.title}) : super(key: key); + const MyHomePage({Key? key, this.title}) : super(key: key); final String? title; diff --git a/packages/sensors_plus/example/lib/snake.dart b/packages/sensors_plus/example/lib/snake.dart index dfb10b185..0b4d18b66 100644 --- a/packages/sensors_plus/example/lib/snake.dart +++ b/packages/sensors_plus/example/lib/snake.dart @@ -11,7 +11,8 @@ import 'package:flutter/material.dart'; import 'package:sensors_plus/sensors_plus.dart'; class Snake extends StatefulWidget { - Snake({this.rows = 20, this.columns = 20, this.cellSize = 10.0}) { + Snake({Key? key, this.rows = 20, this.columns = 20, this.cellSize = 10.0}) + : super(key: key) { assert(10 <= rows); assert(10 <= columns); assert(5.0 <= cellSize); @@ -22,6 +23,7 @@ class Snake extends StatefulWidget { final double cellSize; @override + // ignore: no_logic_in_create_state State createState() => SnakeState(rows, columns, cellSize); } diff --git a/packages/sensors_plus/example/pubspec.yaml b/packages/sensors_plus/example/pubspec.yaml index 788d4171e..57e728421 100644 --- a/packages/sensors_plus/example/pubspec.yaml +++ b/packages/sensors_plus/example/pubspec.yaml @@ -16,7 +16,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/sensors_plus/pubspec.yaml b/packages/sensors_plus/pubspec.yaml index 69a8fd729..8bf21cfab 100644 --- a/packages/sensors_plus/pubspec.yaml +++ b/packages/sensors_plus/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: sdk: flutter dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/packages/share_plus/example/lib/image_previews.dart b/packages/share_plus/example/lib/image_previews.dart index cd8779ed5..f496ad9a2 100644 --- a/packages/share_plus/example/lib/image_previews.dart +++ b/packages/share_plus/example/lib/image_previews.dart @@ -52,7 +52,7 @@ class _ImagePreview extends StatelessWidget { child: Stack( children: [ ConstrainedBox( - constraints: BoxConstraints( + constraints: const BoxConstraints( maxWidth: 200, maxHeight: 200, ), @@ -65,7 +65,7 @@ class _ImagePreview extends StatelessWidget { child: FloatingActionButton( backgroundColor: Colors.red, onPressed: onDelete, - child: Icon(Icons.delete)), + child: const Icon(Icons.delete)), ), ), ], diff --git a/packages/share_plus/example/lib/main.dart b/packages/share_plus/example/lib/main.dart index 43eb32cc5..d59bbc935 100644 --- a/packages/share_plus/example/lib/main.dart +++ b/packages/share_plus/example/lib/main.dart @@ -11,10 +11,12 @@ import 'package:share_plus/share_plus.dart'; import 'image_previews.dart'; void main() { - runApp(DemoApp()); + runApp(const DemoApp()); } class DemoApp extends StatefulWidget { + const DemoApp({Key? key}) : super(key: key); + @override DemoAppState createState() => DemoAppState(); } @@ -62,8 +64,8 @@ class DemoAppState extends State { ImagePreviews(imagePaths, onDelete: _onDeleteImage), Center( child: ListTile( - leading: Icon(Icons.add), - title: Text('Add image'), + leading: const Icon(Icons.add), + title: const Text('Add image'), onTap: () async { final imagePicker = ImagePicker(); final pickedFile = await imagePicker.pickImage( diff --git a/packages/share_plus/example/pubspec.yaml b/packages/share_plus/example/pubspec.yaml index 92181d5fd..51c738935 100644 --- a/packages/share_plus/example/pubspec.yaml +++ b/packages/share_plus/example/pubspec.yaml @@ -21,7 +21,7 @@ dev_dependencies: sdk: flutter integration_test_tizen: path: ../../integration_test/ - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 flutter: uses-material-design: true diff --git a/packages/share_plus/pubspec.yaml b/packages/share_plus/pubspec.yaml index 196516ad7..b9500a785 100644 --- a/packages/share_plus/pubspec.yaml +++ b/packages/share_plus/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: share_plus_platform_interface: ^2.0.0 dev_dependencies: - pedantic: ^1.9.2 + flutter_lints: ^1.0.4 environment: sdk: ">=2.12.0 <3.0.0" From 0e6993c3da3053a6686593565814ad0fd729828b Mon Sep 17 00:00:00 2001 From: Hakkyu Kim Date: Tue, 9 Nov 2021 12:24:57 +0900 Subject: [PATCH 2/2] Follow syntax of plus plugin repo --- analysis_options_plus.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysis_options_plus.yaml b/analysis_options_plus.yaml index 447606ec6..8bb0a7ef6 100644 --- a/analysis_options_plus.yaml +++ b/analysis_options_plus.yaml @@ -10,5 +10,5 @@ analyzer: linter: rules: - prefer_final_in_for_each: true - prefer_final_locals: true + - prefer_final_in_for_each + - prefer_final_locals