From 0f254b1556a4b4ee300f893048777e28ae42800a Mon Sep 17 00:00:00 2001 From: Pascal Welsch Date: Wed, 15 Nov 2023 22:30:27 +0100 Subject: [PATCH] Switch to package lint everywhere --- arcgis_map/analysis_options.yaml | 2 +- arcgis_map/lib/arcgis_map.dart | 1 + arcgis_map/lib/src/arcgis_map_controller.dart | 6 ++++-- arcgis_map/pubspec.yaml | 6 ++---- arcgis_map_android/analysis_options.yaml | 3 +-- arcgis_map_android/pubspec.yaml | 6 ++---- arcgis_map_ios/analysis_options.yaml | 3 +-- arcgis_map_ios/pubspec.yaml | 6 ++---- arcgis_map_method_channel/analysis_options.yaml | 3 +-- arcgis_map_method_channel/pubspec.yaml | 4 +--- arcgis_map_platform_interface/analysis_options.yaml | 3 +-- .../lib/arcgis_map_platform_interface.dart | 1 + .../lib/src/types/feature_reduction_cluster.dart | 2 +- arcgis_map_platform_interface/pubspec.yaml | 2 +- arcgis_map_web/analysis_options.yaml | 2 +- arcgis_map_web/pubspec.yaml | 2 -- example/analysis_options.yaml | 3 +-- example/pubspec.yaml | 3 --- 18 files changed, 22 insertions(+), 36 deletions(-) diff --git a/arcgis_map/analysis_options.yaml b/arcgis_map/analysis_options.yaml index f9b303465..dbda697ae 100644 --- a/arcgis_map/analysis_options.yaml +++ b/arcgis_map/analysis_options.yaml @@ -1 +1 @@ -include: package:flutter_lints/flutter.yaml +include: package:lint/package.yaml \ No newline at end of file diff --git a/arcgis_map/lib/arcgis_map.dart b/arcgis_map/lib/arcgis_map.dart index 881483466..942764917 100644 --- a/arcgis_map/lib/arcgis_map.dart +++ b/arcgis_map/lib/arcgis_map.dart @@ -1,3 +1,4 @@ +// ignore: unnecessary_library_directive library arcgis_map; export 'package:arcgis_map/src/arcgis_map.dart'; diff --git a/arcgis_map/lib/src/arcgis_map_controller.dart b/arcgis_map/lib/src/arcgis_map_controller.dart index 4795eda0f..8651630f3 100644 --- a/arcgis_map/lib/src/arcgis_map_controller.dart +++ b/arcgis_map/lib/src/arcgis_map_controller.dart @@ -180,8 +180,10 @@ class ArcgisMapController { return ArcgisMapPlatform.instance.addGraphic(mapId, layerId, graphic); } - Future removeGraphic( - {required String layerId, required String objectId}) { + Future removeGraphic({ + required String layerId, + required String objectId, + }) { return ArcgisMapPlatform.instance.removeGraphic(mapId, layerId, objectId); } diff --git a/arcgis_map/pubspec.yaml b/arcgis_map/pubspec.yaml index 7b80d56e1..bb94c6d1f 100644 --- a/arcgis_map/pubspec.yaml +++ b/arcgis_map/pubspec.yaml @@ -8,13 +8,11 @@ environment: dependencies: arcgis_map_android: ^0.7.5 arcgis_map_ios: ^0.7.5 - arcgis_map_platform_interface: ^0.7.5 arcgis_map_method_channel: ^0.7.5 + arcgis_map_platform_interface: ^0.7.5 arcgis_map_web: ^0.7.5 flutter: sdk: flutter -# Used to work locally on the package - dev_dependencies: - flutter_lints: ^2.0.1 + lint: ^2.0.0 diff --git a/arcgis_map_android/analysis_options.yaml b/arcgis_map_android/analysis_options.yaml index 448d91f71..dbda697ae 100644 --- a/arcgis_map_android/analysis_options.yaml +++ b/arcgis_map_android/analysis_options.yaml @@ -1,2 +1 @@ -include: package:flutter_lints/flutter.yaml - +include: package:lint/package.yaml \ No newline at end of file diff --git a/arcgis_map_android/pubspec.yaml b/arcgis_map_android/pubspec.yaml index 77f4898be..2bc93a327 100644 --- a/arcgis_map_android/pubspec.yaml +++ b/arcgis_map_android/pubspec.yaml @@ -6,16 +6,14 @@ environment: sdk: ">=2.15.0 <4.0.0" dependencies: - arcgis_map_platform_interface: ^0.7.5 arcgis_map_method_channel: ^0.7.5 + arcgis_map_platform_interface: ^0.7.5 flutter: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.1 - -# Used to work locally on the package + lint: ^2.0.0 flutter: plugin: diff --git a/arcgis_map_ios/analysis_options.yaml b/arcgis_map_ios/analysis_options.yaml index 448d91f71..dbda697ae 100644 --- a/arcgis_map_ios/analysis_options.yaml +++ b/arcgis_map_ios/analysis_options.yaml @@ -1,2 +1 @@ -include: package:flutter_lints/flutter.yaml - +include: package:lint/package.yaml \ No newline at end of file diff --git a/arcgis_map_ios/pubspec.yaml b/arcgis_map_ios/pubspec.yaml index fafe55451..485265f75 100644 --- a/arcgis_map_ios/pubspec.yaml +++ b/arcgis_map_ios/pubspec.yaml @@ -6,16 +6,14 @@ environment: sdk: ">=2.15.0 <4.0.0" dependencies: - arcgis_map_platform_interface: ^0.7.5 arcgis_map_method_channel: ^0.7.5 + arcgis_map_platform_interface: ^0.7.5 flutter: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.1 - -# Used to work locally on the package + lint: ^2.0.0 flutter: plugin: diff --git a/arcgis_map_method_channel/analysis_options.yaml b/arcgis_map_method_channel/analysis_options.yaml index 448d91f71..dbda697ae 100644 --- a/arcgis_map_method_channel/analysis_options.yaml +++ b/arcgis_map_method_channel/analysis_options.yaml @@ -1,2 +1 @@ -include: package:flutter_lints/flutter.yaml - +include: package:lint/package.yaml \ No newline at end of file diff --git a/arcgis_map_method_channel/pubspec.yaml b/arcgis_map_method_channel/pubspec.yaml index ffb1da833..be5087a52 100644 --- a/arcgis_map_method_channel/pubspec.yaml +++ b/arcgis_map_method_channel/pubspec.yaml @@ -11,6 +11,4 @@ dependencies: sdk: flutter dev_dependencies: - flutter_lints: ^2.0.1 - -# Used to work locally on the package + lint: ^2.0.0 diff --git a/arcgis_map_platform_interface/analysis_options.yaml b/arcgis_map_platform_interface/analysis_options.yaml index 448d91f71..dbda697ae 100644 --- a/arcgis_map_platform_interface/analysis_options.yaml +++ b/arcgis_map_platform_interface/analysis_options.yaml @@ -1,2 +1 @@ -include: package:flutter_lints/flutter.yaml - +include: package:lint/package.yaml \ No newline at end of file diff --git a/arcgis_map_platform_interface/lib/arcgis_map_platform_interface.dart b/arcgis_map_platform_interface/lib/arcgis_map_platform_interface.dart index 346e911dc..8b912fadc 100644 --- a/arcgis_map_platform_interface/lib/arcgis_map_platform_interface.dart +++ b/arcgis_map_platform_interface/lib/arcgis_map_platform_interface.dart @@ -1,3 +1,4 @@ +// ignore: unnecessary_library_directive library arcgis_map_platform_interface; export 'package:arcgis_map_platform_interface/src/arcgis_map_platform_interface.dart'; diff --git a/arcgis_map_platform_interface/lib/src/types/feature_reduction_cluster.dart b/arcgis_map_platform_interface/lib/src/types/feature_reduction_cluster.dart index 058d9b11b..90abb1afc 100644 --- a/arcgis_map_platform_interface/lib/src/types/feature_reduction_cluster.dart +++ b/arcgis_map_platform_interface/lib/src/types/feature_reduction_cluster.dart @@ -19,7 +19,7 @@ class FeatureReductionCluster { 'weight': 'bold', 'family': 'Noto Sans', 'size': '12px', - } + }, }, 'labelPlacement': 'center-center', } diff --git a/arcgis_map_platform_interface/pubspec.yaml b/arcgis_map_platform_interface/pubspec.yaml index 138bfbd8c..339c1a52c 100644 --- a/arcgis_map_platform_interface/pubspec.yaml +++ b/arcgis_map_platform_interface/pubspec.yaml @@ -13,6 +13,6 @@ dependencies: plugin_platform_interface: ^2.1.3 dev_dependencies: - flutter_lints: ^2.0.1 + lint: ^2.0.0 flutter: diff --git a/arcgis_map_web/analysis_options.yaml b/arcgis_map_web/analysis_options.yaml index b85a83e7f..bffe1d55b 100644 --- a/arcgis_map_web/analysis_options.yaml +++ b/arcgis_map_web/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:lint/analysis_options_package.yaml +include: package:lint/package.yaml analyzer: exclude: diff --git a/arcgis_map_web/pubspec.yaml b/arcgis_map_web/pubspec.yaml index c5d220d30..df9eddc72 100644 --- a/arcgis_map_web/pubspec.yaml +++ b/arcgis_map_web/pubspec.yaml @@ -18,8 +18,6 @@ dependencies: dev_dependencies: lint: ^2.0.0 -# Used to work locally on the package - flutter: plugin: platforms: diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index 5da26785a..cc8b5987b 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1,2 +1 @@ -include: package:lint/analysis_options_package.yaml - +include: package:lint/casual.yaml \ No newline at end of file diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 3bc620643..e3b40755c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -52,9 +52,6 @@ dev_dependencies: sdk: flutter lint: ^2.0.0 -# Used to work locally on the package - - flutter: assets: - assets/