Set SDK version to '>=3.0.0 <4.0.0', allow analyzer versions 6.x.x

Author: werediver

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0
+
+- Set SDK version to `'>=3.0.0 <4.0.0'`
+- Allow `analyzer` versions 6.x.x
+
 ## 0.3.5
 
 - Update `analyzer` constraint to `'>=4.6.0 <6.0.0'`

analysis_options.yaml

@@ -19,7 +19,6 @@ linter:
     - always_declare_return_types
     - always_put_control_body_on_new_line
     #- always_put_required_named_parameters_first # Breaks the semantic order of declaration
-    - always_require_non_null_named_parameters
     #- always_specify_types # Utilize type inference
     - annotate_overrides
     #- avoid_annotating_with_dynamic # `dynamic` is bad and implicit `dynamic` is worse
@@ -42,8 +41,6 @@ linter:
     - avoid_relative_lib_imports
     - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     - avoid_returning_this
     - avoid_setters_without_getters
@@ -72,12 +69,10 @@ linter:
     #- flutter_style_todos # Too Flutter
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
     - join_return_with_assignment
     - library_names
     - library_prefixes
     #- lines_longer_than_80_chars # Too short
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
@@ -103,7 +98,6 @@ linter:
     - prefer_constructors_over_static_methods
     - prefer_contains
     #- prefer_double_quotes # Disabled, because IDEA generates single-quoted imports
-    - prefer_equal_for_default_values
     - prefer_expression_function_bodies
     - prefer_final_fields
     - prefer_final_in_for_each

example/lib/src/nat.g.dart

@@ -14,12 +14,12 @@ class Optional<T> extends _$Optional<T> {
 
   Optional<U> map<U>(U Function(T) f) => iswitch(
         some: (value) => Optional.some(f(value)),
-        none: () => Optional<U>.none(),
+        none: Optional<U>.none,
       );
 
   Optional<U> flatMap<U>(Optional<U> Function(T) f) => iswitch(
-        some: (value) => f(value),
-        none: () => Optional<U>.none(),
+        some: f,
+        none: Optional<U>.none,
       );
 
   T valueOr(T Function() fallback) =>

example/lib/src/optional.dart

@@ -19,7 +19,7 @@ class PeskyJson extends _$PeskyJson {
         json.map((key, value) => MapEntry(key, PeskyJson.fromJson(value))),
       );
     } else if (json is Iterable<Object>) {
-      return PeskyJson.array(json.map((json) => PeskyJson.fromJson(json)));
+      return PeskyJson.array(json.map(PeskyJson.fromJson));
     } else if (json is String) {
       return PeskyJson.string(json);
     } else if (json is num) {

example/lib/src/optional.g.dart

@@ -5,7 +5,7 @@ homepage: https://github.com/werediver/sum-types.dart
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   json_annotation:

example/lib/src/pesky_json.dart

@@ -5,7 +5,7 @@ homepage: https://github.com/werediver/sum-types-dart
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   meta:

example/lib/src/pesky_json.g.dart

@@ -4,7 +4,7 @@ version: 0.1.0
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dev_dependencies:
   housekeeper:

example/pubspec.yaml

@@ -1,10 +1,10 @@
 name: sum_types
 description: sum_types and sum_types_generator packages together define a code generator enabling sum-types in Dart.
-version: 0.3.5
+version: 0.4.0
 homepage: https://github.com/werediver/sum-types-dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   meta: ^1.1.0

housekeeper/pubspec.yaml

@@ -103,7 +103,7 @@ SumTypeSpec makeSumTypeSpec(Element element, ConstantReader annotation) {
         (o) => o.imports
             .map((import) =>
                 import.importedLibrary?.location?.components.firstOrNull)
-            .whereNotNull()
+            .nonNulls
             .map((importLocation) => MapEntry(importLocation, o.name)),
       ),
     );
@@ -125,7 +125,7 @@ SumTypeSpec makeSumTypeSpec(Element element, ConstantReader annotation) {
       typeParams: element.typeParameters.map(
         (e) => TypeParamSpec(
           name: e.name,
-          bound: e.bound?.element2?.name,
+          bound: e.bound?.element?.name,
         ),
       ),
       cases: element.constructors
@@ -198,12 +198,15 @@ String _resolveTypeName(
   final _name = name ??
       (type) {
         final prefix =
-            importPrefixes?[type.element2?.library?.location?.components.first];
+            importPrefixes?[type.element?.library?.location?.components.first];
         return [
           if (prefix != null) "$prefix.",
           type.getDisplayString(
-            withNullability: false,
-          )
+            // Newer versions of "analyzer" (somewhere after 6.0.0) declare `withNullability`
+            // deprecated (and locked to `true`), but older versions require it.
+            // ignore: deprecated_member_use
+            withNullability: true,
+          ),
         ].join();
       };
   return _name(type);

pubspec.yaml

@@ -1,18 +1,18 @@
 name: sum_types_generator
 description: sum_types and sum_types_generator packages together define a code generator enabling sum-types in Dart.
-version: 0.3.5
+version: 0.4.0
 homepage: https://github.com/werediver/sum-types-dart
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  analyzer: '>=4.6.0 <6.0.0'
+  analyzer: '>=4.6.0 <7.0.0'
   build: ^2.0.1
   collection: ^1.17.0
   meta: ^1.1.0
   source_gen: ^1.0.0
-  sum_types: ^0.3.0
+  sum_types: ^0.4.0
 
 dev_dependencies:
   dependency_validator: