Upgrade to Dart 3.4.0

alexei-sintotski · Dec 6, 2024 · d34e3ca · d34e3ca
1 parent ff7dc58
commit d34e3ca
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -14,10 +14,10 @@ jobs:
       # Note: This workflow uses the latest stable version of the Dart SDK.
       # You can specify other versions if desired, see documentation here:
       # https://github.com/dart-lang/setup-dart/blob/main/README.md
-      # - uses: dart-lang/setup-dart@v1
-      - uses: dart-lang/setup-dart@v1
+      # - uses: dart-lang/setup-dart@v1.7.0
+      - uses: dart-lang/setup-dart@v1.7.0
         with:
-          sdk: 2.19.1
+          sdk: 3.4.0
 
       - name: Install dependencies
         run: dart pub get

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -40,7 +40,6 @@ linter:
     - avoid_positional_boolean_parameters
     - avoid_private_typedef_functions
     - avoid_redundant_argument_values
-    - avoid_returning_null
     - avoid_returning_this
     - avoid_setters_without_getters
     - avoid_unused_constructor_parameters

diff --git a/lib/src/dart_package/dart_package.dart b/lib/src/dart_package/dart_package.dart
@@ -64,10 +64,10 @@ class DartPackage {
   String toString() => 'DartPackage(path: $path)';
 
   @override
-  // ignore: avoid_annotating_with_dynamic
-  bool operator ==(dynamic other) =>
-      // ignore: avoid_dynamic_calls
-      other.runtimeType == runtimeType && path == other.path;
+  bool operator ==(Object other) =>
+      other is DartPackage &&
+      other.runtimeType == runtimeType &&
+      path == other.path;
 
   @override
   int get hashCode {

diff --git a/lib/src/generic_dependency_usage_report.dart b/lib/src/generic_dependency_usage_report.dart
@@ -47,12 +47,10 @@ class DependencyUsageReport<DependencyType> {
       'references: $references)';
 
   @override
-  // ignore: avoid_annotating_with_dynamic
-  bool operator ==(dynamic other) =>
+  bool operator ==(Object other) =>
+      other is DependencyUsageReport<DependencyType> &&
       other.runtimeType == runtimeType &&
-      // ignore: avoid_dynamic_calls
       dependencyName == other.dependencyName &&
-      // ignore: avoid_dynamic_calls
       const DeepCollectionEquality().equals(references, other.references);
 
   @override

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ executables:
   borg: main
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=2.15.0 <4.0.0"
 
 dependencies:
   args: ^2.3.0

diff --git a/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml b/test/integration_test_sets/package_with_pubspec_lock/pubspec.yaml
@@ -1,7 +1,7 @@
 name: package_with_pubspec_lock
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   args: ^2.3.0

diff --git a/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml b/test/integration_test_sets/package_without_pubspec_lock/pubspec.yaml
@@ -1,7 +1,7 @@
 name: package_without_pubspec_lock
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   args: ^2.3.0