refactor: Bump min required dart version (#187)

* refactor: Bump min required dart version * upgrade and lint
conduit-dart · Feb 1, 2023 · 0e87040 · 0e87040
1 parent 737fcb8
commit 0e87040
Show file tree

Hide file tree

Showing 53 changed files with 95 additions and 304 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
   docs:
     if: |
       github.event_name == 'workflow_dispatch' 
-      || (github.event.pull_request.merged && contains(github.ref, 'docs/'))
+      || (github.event.pull_request.merged && startsWith(github.head_ref, 'docs/'))
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

diff --git a/melos.yaml b/melos.yaml
@@ -21,7 +21,8 @@ scripts:
     run: melos exec --ignore "*common*" --ignore "*application*" --ignore "*dependency*" -- "dart $MELOS_ROOT_PATH/utils/unused_port.dart | dart pub global run coverage:test_with_coverage --port -"
     select-pacakge:
       no-private: true
-  analyze: melos exec -- dart pub global run tuneup check
+  analyze: melos exec -- dart analyze .
+  upgrade: melos exec -- dart pub upgrade
   activate-all:
     run: melos exec -- "dart pub global activate '\$MELOS_PACKAGE_NAME'"
     select-pacakge:
@@ -46,5 +47,5 @@ scripts:
     select-pacakge:
       no-private: true
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 
diff --git a/packages/cli/analysis_options.yaml b/packages/cli/analysis_options.yaml
@@ -1,8 +1,6 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
   exclude:
     - tmp/**
     - templates/**
diff --git a/packages/cli/lib/src/cli/scripts/openapi_builder.dart b/packages/cli/lib/src/cli/scripts/openapi_builder.dart
@@ -170,7 +170,6 @@ Future<Map<String, dynamic>> documentProject(
     "licenseName": options.licenseName,
     "resolveRelativeUrls": options.resolveRelativeUrls
   };
-  print(project.projectSpecificationFile.readAsStringSync());
 
   final result = await IsolateExecutor.run(
     OpenAPIBuilder(variables),

diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml
@@ -3,7 +3,7 @@ version: 4.2.0
 homepage: https://github.com/conduit-dart/conduit
 description: A modern HTTP server application framework, ORM and OAuth2 provider with OpenAPI 3.0 integration. Foundation for REST, RPC or GraphQL services.
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 dependencies:
   analyzer: ^5.1.0
   args: ^2.1.1
@@ -32,7 +32,6 @@ dev_dependencies:
   fs_test_agent:
     path: ../fs_test_agent
   http: ^0.13.0
-  lint: ^2.0.0
   lints: ^2.0.1
   matcher: ^0.12.12
   mockito: ^5.3.2

diff --git a/packages/cli/templates/db/analysis_options.yaml b/packages/cli/templates/db/analysis_options.yaml
@@ -1,6 +1,3 @@
-analyzer:
-  strong-mode:
-    implicit-casts: false
 
 linter:
   rules:

diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
   conduit: ^4.1.6

diff --git a/packages/cli/templates/db_and_auth/analysis_options.yaml b/packages/cli/templates/db_and_auth/analysis_options.yaml
@@ -1,7 +1,3 @@
-analyzer:
-  strong-mode:
-    implicit-casts: false
-
 linter:
   rules:
     - always_declare_return_types

diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
   conduit: ^4.1.6

diff --git a/packages/cli/templates/default/analysis_options.yaml b/packages/cli/templates/default/analysis_options.yaml
@@ -1,7 +1,3 @@
-analyzer:
-  strong-mode:
-    implicit-casts: false
-
 linter:
   rules:
     - always_declare_return_types

diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
   conduit: ^4.1.6

diff --git a/packages/codable/analysis_options.yaml b/packages/codable/analysis_options.yaml
@@ -1 +1 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
diff --git a/packages/codable/pubspec.yaml b/packages/codable/pubspec.yaml
@@ -3,9 +3,9 @@ version: 4.2.0
 homepage: https://github.com/conduit-dart/conduit-codable
 description: A serialization library for converting dynamic, structured data (JSON, YAML) into Dart types.
 environment:
-  sdk: '>=2.18.6 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
 dependencies:
   meta: ^1.3.0
 dev_dependencies:
-  lint: ^2.0.0
+  lints: ^2.0.1
   test: ^1.21.6
diff --git a/packages/common/analysis_options.yaml b/packages/common/analysis_options.yaml
@@ -1 +1 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
diff --git a/packages/common/pubspec.yaml b/packages/common/pubspec.yaml
@@ -3,8 +3,8 @@ version: 4.2.0
 description: Common classes shared by conduit projects.
 repository: https://github.com/bsutton/conduit-orm
 environment:
-  sdk: '>=2.18.6 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
 dependencies:
   conduit_open_api: ^4.2.0
 dev_dependencies:
-  lint: ^2.0.0
+  lints: ^2.0.1
diff --git a/packages/common_test/analysis_options.yaml b/packages/common_test/analysis_options.yaml
@@ -1,98 +1 @@
-analyzer:
-  strong-mode:
-    implicit-casts: false
-
-linter:
-  rules:
-    - always_declare_return_types
-    - always_put_control_body_on_new_line
-    - always_put_required_named_parameters_first
-    - always_require_non_null_named_parameters
-    - annotate_overrides
-    - avoid_bool_literals_in_conditional_expressions
-    - avoid_double_and_int_checks
-    - avoid_empty_else
-    - avoid_field_initializers_in_const_classes
-    - avoid_init_to_null
-    - avoid_null_checks_in_equality_operators
-    - avoid_positional_boolean_parameters
-    - avoid_relative_lib_imports
-    - avoid_renaming_method_parameters
-    - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_single_cascade_in_expression_statements
-    - avoid_slow_async_io
-    - avoid_types_as_parameter_names
-    - avoid_unused_constructor_parameters
-    - await_only_futures
-    - camel_case_types
-    - cancel_subscriptions
-    - close_sinks
-    - comment_references
-    - constant_identifier_names
-    - control_flow_in_finally
-    - directives_ordering
-    - empty_catches
-    - empty_constructor_bodies
-    - empty_statements
-    - file_names
-    - hash_and_equals
-    - implementation_imports
-    - iterable_contains_unrelated_type
-    - join_return_with_assignment
-    - library_names
-    - library_prefixes
-    - list_remove_unrelated_type
-    - literal_only_boolean_expressions
-    - no_duplicate_case_values
-    - non_constant_identifier_names
-    - null_closures
-    - package_api_docs
-    - package_names
-    - package_prefixed_library_names
-    - parameter_assignments
-    - prefer_adjacent_string_concatenation
-    - prefer_asserts_in_initializer_lists
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_const_constructors
-    - prefer_const_constructors_in_immutables
-    - prefer_const_declarations
-    - prefer_const_literals_to_create_immutables
-    - prefer_constructors_over_static_methods
-    - prefer_contains
-    - prefer_equal_for_default_values
-    - prefer_final_fields
-    - prefer_final_locals
-    - prefer_foreach
-    - prefer_generic_function_type_aliases
-    - prefer_interpolation_to_compose_strings
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_iterable_whereType
-    - prefer_typing_uninitialized_variables
-    - recursive_getters
-    - slash_for_doc_comments
-    - sort_constructors_first
-    - sort_unnamed_constructors_first
-    - test_types_in_equals
-    - throw_in_finally
-    - type_annotate_public_apis
-    - type_init_formals
-    - unawaited_futures
-    - unnecessary_const
-    - unnecessary_getters_setters
-    - unnecessary_lambdas
-    - unnecessary_new
-    - unnecessary_null_aware_assignments
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_overrides
-    - unnecessary_parenthesis
-    - unnecessary_statements
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    - use_rethrow_when_possible
-    - use_string_buffers
-    - use_to_and_as_if_applicable
-    - valid_regexps
-    - void_checks
+include: package:lints/recommended.yaml
diff --git a/packages/common_test/lib/src/db/postgres/postgres_test_config.dart b/packages/common_test/lib/src/db/postgres/postgres_test_config.dart
@@ -24,7 +24,7 @@ class PostgresTestConfig {
 
   PostgresTestConfig._internal();
 
-  static late final PostgresTestConfig _self = PostgresTestConfig._internal();
+  static final PostgresTestConfig _self = PostgresTestConfig._internal();
 
   String get connectionUrl =>
       "postgres://$username:$password@$host:$port/$dbName";
@@ -98,15 +98,15 @@ class PostgresTestConfig {
   int get port {
     if (_port == null) {
       /// Check for an environment variable.
-      const _key = 'POSTGRES_PORT';
-      if (Platform.environment.containsKey(_key)) {
-        final value = Platform.environment[_key];
+      const key = 'POSTGRES_PORT';
+      if (Platform.environment.containsKey(key)) {
+        final value = Platform.environment[key];
         if (value != null) {
           _port = int.tryParse(value);
         }
         if (_port == null) {
           throw ArgumentError(
-              "The Environment Variable $_key does not contain a valid integer. Found: $value");
+              "The Environment Variable $key does not contain a valid integer. Found: $value");
         }
       }
     }

diff --git a/packages/common_test/pubspec.yaml b/packages/common_test/pubspec.yaml
@@ -4,7 +4,9 @@ homepage: https://github.com/conduit-dart/common-test
 description: A collection of classes and function used for testing conduit and by the conduit test harness.
 publish_to: none
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 dependencies:
   conduit_common: ^4.2.0
-  conduit_core: ^4.2.0
+  conduit_core: ^4.2.0
+dev_dependencies:
+  lints: ^2.0.1
diff --git a/packages/config/analysis_options.yaml b/packages/config/analysis_options.yaml
@@ -1 +1 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
diff --git a/packages/config/pubspec.yaml b/packages/config/pubspec.yaml
@@ -3,11 +3,11 @@ version: 4.2.0
 description: A safe and convenient way to read YAML configuration files.
 repository: https://github.com/conduit-dart/conduit-config.git
 environment:
-  sdk: '>=2.18.6 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
 dependencies:
   conduit_runtime: ^4.2.0
   meta: ^1.3.0
   yaml: ^3.1.0
 dev_dependencies:
-  lint: ^2.0.0
+  lints: ^2.0.1
   test: ^1.21.6
diff --git a/packages/core/analysis_options.yaml b/packages/core/analysis_options.yaml
@@ -1,8 +1,6 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
   exclude:
     - tmp/**
     - templates/**
diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml
@@ -3,7 +3,7 @@ version: 4.2.0
 homepage: https://github.com/conduit-dart/conduit
 description: This is the core of the framework.
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 dependencies:
   analyzer: ^5.1.0
   args: ^2.1.1
@@ -31,7 +31,6 @@ dev_dependencies:
   fs_test_agent:
     path: ../fs_test_agent
   http: ^0.13.0
-  lint: ^2.0.0
   lints: ^2.0.1
   matcher: ^0.12.12
   mockito: ^5.3.2

diff --git a/packages/fs_test_agent/analysis_options.yaml b/packages/fs_test_agent/analysis_options.yaml
@@ -1 +1 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
diff --git a/packages/fs_test_agent/lib/dart_project_agent.dart b/packages/fs_test_agent/lib/dart_project_agent.dart
@@ -85,10 +85,7 @@ class DartProjectAgent extends WorkingDirectoryAgent {
   }
 
   final _analysisOptionsContents = """
-  analyzer:
-  strong-mode:
-    implicit-casts: false
-""";
+  """;
 
   static String _asYaml(Map<String, dynamic> m, {int indent = 0}) {
     final buf = StringBuffer();
@@ -112,15 +109,19 @@ class DartProjectAgent extends WorkingDirectoryAgent {
     return buf.toString();
   }
 
-  String _pubspecContents(String name, Map<String, dynamic> deps,
-      Map<String, dynamic> devDeps, Map<String, dynamic> dependencyOverrides) {
+  String _pubspecContents(
+    String name,
+    Map<String, dynamic> deps,
+    Map<String, dynamic> devDeps,
+    Map<String, dynamic> dependencyOverrides,
+  ) {
     return """
 name: $name
 description: desc
 version: 0.0.1
 
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
 ${_asYaml(deps, indent: 1)}

diff --git a/packages/fs_test_agent/pubspec.yaml b/packages/fs_test_agent/pubspec.yaml
@@ -3,10 +3,10 @@ version: 4.2.0
 homepage: https://stablekernel.com
 description: Utilities for writing tests to validate file system and Dart project directory operations.
 environment:
-  sdk: '>=2.18.6 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
 dependencies:
   path: ^1.0.0
   pubspec: ^2.0.1
 dev_dependencies:
-  lint: ^2.0.0
+  lints: ^2.0.1
   test: ^1.21.6
diff --git a/packages/isolate_exec/analysis_options.yaml b/packages/isolate_exec/analysis_options.yaml
@@ -1,5 +1 @@
-include: package:lint/analysis_options.yaml
-
-analyzer:
-  strong-mode:
-    implicit-casts: true
+include: package:lints/recommended.yaml