refactor: bump analysis to Dart 3.5, fix lints

tenhobi · tenhobi · commit 68b57561c2c3 · 2024-08-15T10:58:18.000+02:00
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.19.4"
+  "flutterSdkVersion": "3.24.0"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.19.4"
+  "flutter": "3.24.0"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.19.4",
+  "dart.flutterSdkPath": ".fvm/versions/3.24.0",
   "search.exclude": {
     "**/.fvm": true,
     "**/*.g.dart": true
diff --git a/dcm_global.yaml b/dcm_global.yaml
@@ -0,0 +1 @@
+version: "1.21.1"
diff --git a/packages/netglade_analysis/CHANGELOG.md b/packages/netglade_analysis/CHANGELOG.md
@@ -1,11 +1,11 @@
 ## 12.0.0
-- Adhere to DCM 1.18.0 and 1.19.0:
+- Minimal Dart 3.5.0
+- Adhere to DCM 1.18.0, 1.19.0, and 1.21.0:
   - Add avoid-only-rethrow
   - Add avoid-returning-cascades
   - Add avoid-unsafe-reduce
   - Add handle-throwing-invocations
   - Add prefer-abstract-final-static-class
-  - Add prefer-correct-throws
   - Add avoid-incorrect-image-opacity
   - Add avoid-calling-notifier-members-inside-build
   - Add avoid-notifier-constructors
diff --git a/packages/netglade_analysis/lib/dcm.yaml b/packages/netglade_analysis/lib/dcm.yaml
@@ -255,15 +255,15 @@ dart_code_metrics:
     - prefer-correct-switch-length:
         max-length: 20 # default value 10 is sometimes way too much
     - prefer-correct-test-file-name
-    - prefer-correct-throws
+    # - prefer-correct-throws # for now hard to maintain
     - prefer-correct-type-name
     - prefer-declaring-const-constructor
     - prefer-early-return
     - prefer-enums-by-name
     - prefer-explicit-function-type
     - prefer-explicit-parameter-names
     # - prefer-explicit-type-arguments # inference is better
-    - prefer-extracting-function-callbacks # TODO
+    # - prefer-extracting-function-callbacks # not now
     - prefer-first
     # - prefer-getter-over-method # way too pedantic
     - prefer-immediate-return
diff --git a/packages/netglade_analysis/lib/netglade_analysis.dart b/packages/netglade_analysis/lib/netglade_analysis.dart
@@ -1,5 +1,5 @@
 // ignore_for_file: unused-files
 
 /// NetGlade Dart and Flutter analyzer settings and best practices
-/// used internally at [netglade](https://netglade.com).
-library netglade_analysis;
+/// used internally at netglade.
+library;
diff --git a/packages/netglade_analysis/pubspec.yaml b/packages/netglade_analysis/pubspec.yaml
@@ -10,4 +10,4 @@ screenshots:
     path: doc/icon.png
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
diff --git a/packages/netglade_flutter_utils/lib/netglade_flutter_utils.dart b/packages/netglade_flutter_utils/lib/netglade_flutter_utils.dart
@@ -1,5 +1,5 @@
 /// NetGlade Flutter utils library
-/// used internally at [netglade](https://netglade.com).
+/// used internally at netglade.
 library netglade_flutter_utils;
 
 export 'src/conditionals/conditionals.dart';
diff --git a/packages/netglade_flutter_utils/lib/src/conditionals/conditional.dart b/packages/netglade_flutter_utils/lib/src/conditionals/conditional.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 /// Based on [condition] builds either [whenTrue] on true or [whenFalse] on false.
 /// If no [whenFalse] is specified, `SizedBox.shrink()` is used.
 class Conditional extends StatelessWidget {
+  // ignore: prefer-boolean-prefixes, dont wannta change public API
   final bool condition;
 
   // ignore: prefer-correct-callback-field-name, this is more suited
diff --git a/packages/netglade_flutter_utils/lib/src/conditionals/conditional_child.dart b/packages/netglade_flutter_utils/lib/src/conditionals/conditional_child.dart
@@ -6,6 +6,7 @@ typedef WidgetWithChildBuilder = Widget Function(BuildContext context, Widget ch
 /// Based on [condition] builds either [whenTrue] on true or [whenFalse] on false and wraps [child] widget.
 /// If no [whenFalse] is specified, `SizedBox.shrink()` is used.
 class ConditionalChild extends StatelessWidget {
+  // ignore: prefer-boolean-prefixes, dont wannta change public API
   final bool condition;
 
   // ignore: prefer-correct-callback-field-name, this is more suited
diff --git a/packages/netglade_flutter_utils/lib/src/conditionals/conditional_wrap.dart b/packages/netglade_flutter_utils/lib/src/conditionals/conditional_wrap.dart
@@ -5,6 +5,7 @@ typedef WrapperBuilder = Widget Function(BuildContext context, Widget child);
 
 /// Wraps [child] child in [wrapper] widget only if [condition] is true.
 class ConditionalWrap extends StatelessWidget {
+  // ignore: prefer-boolean-prefixes, dont wannta change public API
   final bool condition;
 
   // ignore: prefer-correct-callback-field-name, this is more suited
diff --git a/packages/netglade_flutter_utils/lib/src/extensions/text_style_extensions.dart b/packages/netglade_flutter_utils/lib/src/extensions/text_style_extensions.dart
@@ -10,8 +10,12 @@ extension TextStyleExtensions on TextStyle {
   TextStyle get italic => copyWith(fontStyle: FontStyle.italic);
 
   TextStyle withLetterSpacing(double value) => copyWith(letterSpacing: value);
+
   TextStyle withLineHeight(double value) => copyWith(height: value);
+
   TextStyle withColor(Color? value) => color != null ? copyWith(color: value) : this;
+
   TextStyle withWeight(FontWeight value) => copyWith(fontWeight: value);
+
   TextStyle withSize(double size) => copyWith(fontSize: size);
 }
diff --git a/packages/netglade_flutter_utils/lib/src/hooks/on_page_is_visible.dart b/packages/netglade_flutter_utils/lib/src/hooks/on_page_is_visible.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:netglade_flutter_utils/src/hooks/route_aware.dart';
 
+// ignore: prefer-boolean-prefixes, dont wannta change public API
 typedef OnPageVisibleCallback = void Function({bool pushedIn});
 
 /// Callback [onPageVisible] called when current PageRoute is visible again.
diff --git a/packages/netglade_utils/lib/netglade_utils.dart b/packages/netglade_utils/lib/netglade_utils.dart
@@ -1,5 +1,5 @@
 /// NetGlade Dart utils library
-/// used internally at [netglade](https://netglade.com).
+/// used internally at netglade.
 library netglade_utils;
 
 export 'src/copy/copy.dart';
diff --git a/packages/netglade_utils/lib/src/extensions/date_time_extensions.dart b/packages/netglade_utils/lib/src/extensions/date_time_extensions.dart
@@ -43,6 +43,7 @@ extension DateTimeExtensions on DateTime {
   DateTime get onlyTime => DateTime(1900, 0, 0, hour, minute);
 
   /// Returns true if this is before or is the same as [other].
+  // ignore: prefer-boolean-prefixes, dont wannta change public API
   bool isBeforeOrSame(DateTime other, {bool includeTime = false}) {
     if (includeTime) {
       return isBefore(other) || this == other;
@@ -52,6 +53,7 @@ extension DateTimeExtensions on DateTime {
   }
 
   /// Returns true if this is after os is the same as [other].
+  // ignore: prefer-boolean-prefixes, dont wannta change public API
   bool isAfterOrSame(DateTime other, {bool includeTime = false}) {
     return other.isBeforeOrSame(this, includeTime: includeTime);
   }
@@ -69,6 +71,7 @@ extension DateTimeExtensions on DateTime {
   }
 }
 
+// ignore: prefer-single-declaration-per-file, this can be here
 enum DateSpecification {
   endOfWeek,
   nextWeek,
diff --git a/packages/netglade_utils/lib/src/extensions/future_extensions.dart b/packages/netglade_utils/lib/src/extensions/future_extensions.dart
@@ -7,7 +7,6 @@ typedef OnTakingTooLongCallback = void Function();
 extension FutureExtensions<T> on Future<T> {
   static const standardProlongTimeMs = 300;
 
-  // ignore: comment_references, see https://github.com/dart-lang/linter/issues/2079
   /// If [this] future taking longer than [duration] to execute - [callback] is called.
   Future<T> onTakingTooLong(
     Duration duration,
diff --git a/packages/netglade_utils/lib/src/extensions/iterable_extensions.dart b/packages/netglade_utils/lib/src/extensions/iterable_extensions.dart
@@ -21,6 +21,7 @@ extension IterableExtensions<T> on Iterable<T> {
   Iterable<K> mapIndexed2<K>(K Function(int index, T value) map) => indexed.map((entry) => map(entry.$1, entry.$2));
 }
 
+// ignore: prefer-single-declaration-per-file, this can be here
 extension IterableIterableExtension<T> on Iterable<Iterable<T>> {
   List<T> get flattenedList => [for (final elements in this) ...elements];
 }
diff --git a/packages/netglade_utils/lib/src/extensions/string_extensions.dart b/packages/netglade_utils/lib/src/extensions/string_extensions.dart
@@ -80,6 +80,7 @@ extension StringExtensions on String {
   }
 }
 
+// ignore: prefer-single-declaration-per-file, this can be here
 extension NullableStringExtensions on String? {
   /// Returns true when `this` is either `null` or `isBlank`.
   ///
diff --git a/packages/netglade_utils/lib/src/result/option.dart b/packages/netglade_utils/lib/src/result/option.dart
@@ -87,6 +87,7 @@ final class Some<T> extends Option<T> {
       some(value);
 }
 
+// ignore: prefer-single-declaration-per-file, this can be here
 extension OptionExtension<T> on Option<T> {
   // ignore: avoid-non-null-assertion, developer's responsbility
   T get asSome => mapOrNull(some: (r) => r)!.value;
diff --git a/packages/netglade_utils/lib/src/result/result_impl.dart b/packages/netglade_utils/lib/src/result/result_impl.dart
@@ -86,6 +86,7 @@ final class Error<S, E> extends Result<S, E> {
       error(this.error);
 }
 
+// ignore: prefer-single-declaration-per-file, this can be here
 extension ResultExtension<S, E> on Result<S, E> {
   bool get isSuccess => this is Success<S, E>;
   bool get isError => !isSuccess;
diff --git a/packages/netglade_utils/lib/src/testing/mock_extensions.dart b/packages/netglade_utils/lib/src/testing/mock_extensions.dart
@@ -1,4 +1,4 @@
-// ignore_for_file: prefer-match-file-name
+// ignore_for_file: prefer-match-file-name, prefer-single-declaration-per-file
 
 import 'dart:async';
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "flutterSdkVersion": "3.19.4"`
	`2`	`+ "flutterSdkVersion": "3.24.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "flutter": "3.19.4"`
	`2`	`+ "flutter": "3.24.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "dart.flutterSdkPath": ".fvm/versions/3.19.4",`
	`2`	`+ "dart.flutterSdkPath": ".fvm/versions/3.24.0",`
`3`	`3`	`"search.exclude": {`
`4`	`4`	`"**/.fvm": true,`
`5`	`5`	`"*/.g.dart": true`