Enable and fix lints, fix changelog, prepare v1.2.7 (#640)

kevmoo · web-flow · commit 4969e7d1b2c9 · 2023-01-31T13:38:42.000-08:00
Fixes #638
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -143,50 +143,6 @@ jobs:
         if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
         working-directory: source_gen
   job_004:
-    name: "analyze_format; windows; Dart 2.18.0; PKG: source_gen; `dart analyze`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
-        with:
-          sdk: "2.18.0"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-      - id: source_gen_pub_upgrade
-        name: source_gen; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: source_gen
-      - name: source_gen; dart analyze
-        run: dart analyze
-        if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
-        working-directory: source_gen
-  job_005:
-    name: "analyze_format; windows; Dart dev; PKG: source_gen; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
-    runs-on: windows-latest
-    steps:
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
-        with:
-          sdk: dev
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-      - id: source_gen_pub_upgrade
-        name: source_gen; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: source_gen
-      - name: "source_gen; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
-        working-directory: source_gen
-      - name: "source_gen; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.source_gen_pub_upgrade.conclusion == 'success'"
-        working-directory: source_gen
-  job_006:
     name: "unit_test; linux; Dart 2.18.0; PKG: example_usage; `dart test --run-skipped`"
     runs-on: ubuntu-latest
     steps:
@@ -220,9 +176,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
-  job_007:
+  job_005:
     name: "unit_test; linux; Dart 2.18.0; PKG: source_gen; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -256,9 +210,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
-  job_008:
+  job_006:
     name: "unit_test; linux; Dart dev; PKG: example_usage; `dart test --run-skipped`"
     runs-on: ubuntu-latest
     steps:
@@ -292,9 +244,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
-  job_009:
+  job_007:
     name: "unit_test; linux; Dart dev; PKG: source_gen; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -328,9 +278,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
-  job_010:
+  job_008:
     name: "unit_test; windows; Dart 2.18.0; PKG: source_gen; `dart test`"
     runs-on: windows-latest
     steps:
@@ -354,9 +302,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
-  job_011:
+  job_009:
     name: "unit_test; windows; Dart dev; PKG: source_gen; `dart test`"
     runs-on: windows-latest
     steps:
@@ -380,5 +326,3 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-      - job_005
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -22,9 +22,14 @@ linter:
     - avoid_void_async
     - cancel_subscriptions
     - cascade_invocations
+    - collection_methods_unrelated_type
+    - combinators_ordering
     - comment_references
+    - dangling_library_doc_comments
     - directives_ordering
+    - implicit_call_tearoffs
     - join_return_with_assignment
+    - library_annotations
     - lines_longer_than_80_chars
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
@@ -40,14 +45,21 @@ linter:
     - prefer_relative_imports
     - prefer_single_quotes
     - require_trailing_commas
+    - sort_child_properties_last
     - sort_pub_dependencies
     - test_types_in_equals
     - throw_in_finally
     - type_annotate_public_apis
     - unawaited_futures
     - unnecessary_await_in_return
     - unnecessary_lambdas
+    - unnecessary_library_directive
     - unnecessary_parenthesis
     - unnecessary_statements
+    - unreachable_from_main
+    - unsafe_html
+    - use_full_hex_values_for_flutter_colors
     - use_is_even_rather_than_modulo
     - use_string_buffers
+    - use_string_in_part_of_directives
+    - use_super_parameters
diff --git a/example_usage/test/ensure_build_test.dart b/example_usage/test/ensure_build_test.dart
@@ -5,6 +5,8 @@
 @Timeout.factor(2)
 @TestOn('vm')
 @Tags(['presubmit-only'])
+library test;
+
 import 'package:build_verify/build_verify.dart';
 import 'package:test/test.dart';
 
diff --git a/source_gen/CHANGELOG.md b/source_gen/CHANGELOG.md
@@ -1,5 +1,3 @@
-## 1.2.8-dev
-
 ## 1.2.7
 
 * Update the value of the pubspec `repository` field.
diff --git a/source_gen/lib/source_gen.dart b/source_gen/lib/source_gen.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'src/builder.dart'
-    show defaultFileHeader, LibraryBuilder, PartBuilder, SharedPartBuilder;
+    show LibraryBuilder, PartBuilder, SharedPartBuilder, defaultFileHeader;
 export 'src/constants/reader.dart' show ConstantReader;
 export 'src/constants/revive.dart' show Revivable;
 export 'src/generator.dart' show Generator, InvalidGenerationSourceError;
diff --git a/source_gen/lib/src/builder.dart b/source_gen/lib/src/builder.dart
@@ -2,6 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+//TODO(kevmoo): https://github.com/dart-lang/linter/issues/3563
+// ignore_for_file: use_super_parameters
+
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
diff --git a/source_gen/lib/src/constants/reader.dart b/source_gen/lib/src/constants/reader.dart
@@ -5,7 +5,6 @@
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:meta/meta.dart';
 
 import '../type_checker.dart';
 import 'revive.dart';
@@ -115,10 +114,8 @@ abstract class ConstantReader {
 }
 
 class _NullConstant extends ConstantReader {
-  @alwaysThrows
-  static T _throw<T>(String expected) {
-    throw FormatException('Not an instance of $expected.');
-  }
+  static T _throw<T>(String expected) =>
+      throw FormatException('Not an instance of $expected.');
 
   const _NullConstant() : super._();
 
diff --git a/source_gen/mono_pkg.yaml b/source_gen/mono_pkg.yaml
@@ -3,10 +3,6 @@ sdk:
 - pubspec
 - dev
 
-os:
-- linux
-- windows
-
 stages:
 - analyze_format:
   - group:
@@ -17,7 +13,11 @@ stages:
     - analyze
     sdk: pubspec
 - unit_test:
-  - test
+  - group:
+      - test
+    os:
+    - linux
+    - windows
 
 cache:
   directories:
diff --git a/source_gen/pubspec.yaml b/source_gen/pubspec.yaml
@@ -1,5 +1,5 @@
 name: source_gen
-version: 1.2.8-dev
+version: 1.2.7
 description: >-
   Source code generation builders and utilities for the Dart build system
 repository: https://github.com/dart-lang/source_gen/tree/master/source_gen
@@ -13,7 +13,6 @@ dependencies:
   build: ^2.1.0
   dart_style: ^2.0.0
   glob: ^2.0.0
-  meta: ^1.3.0
   path: ^1.8.0
   source_span: ^1.8.0
   yaml: ^3.0.0
diff --git a/source_gen/test/builder_test.dart b/source_gen/test/builder_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library test;
+
 import 'dart:async';
 
 import 'package:build/build.dart';
diff --git a/source_gen/test/external_only_type_checker_test.dart b/source_gen/test/external_only_type_checker_test.dart
@@ -7,6 +7,8 @@
 
 // Increase timeouts on this test which resolves source code and can be slow.
 @Timeout.factor(2.0)
+library test;
+
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart';
diff --git a/source_gen/test/generator_for_annotation_test.dart b/source_gen/test/generator_for_annotation_test.dart
@@ -4,6 +4,8 @@
 
 // The first test that runs `testBuilder` takes a LOT longer than the rest.
 @Timeout.factor(3)
+library test;
+
 import 'package:analyzer/dart/analysis/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
diff --git a/source_gen/test/test_files/annotated_classes.dart b/source_gen/test/test_files/annotated_classes.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library source_gen.test.annotation_test.classes;
-
 import 'package:_test_annotations/test_annotations.dart';
 
 import 'annotations.dart';
diff --git a/source_gen/test/test_files/annotated_classes_part.dart b/source_gen/test/test_files/annotated_classes_part.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of source_gen.test.annotation_test.classes;
+part of 'annotated_classes.dart';
 
 const localUntypedAnnotationInPart = PublicAnnotationClass();
 
diff --git a/source_gen/test/type_checker_test.dart b/source_gen/test/type_checker_test.dart
@@ -2,8 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// ignore_for_file: unreachable_from_main
+
 // Increase timeouts on this test which resolves source code and can be slow.
 @Timeout.factor(2.0)
+library test;
+
 import 'dart:collection';
 
 import 'package:analyzer/dart/element/element.dart';
diff --git a/source_gen/test/utils_test.dart b/source_gen/test/utils_test.dart
@@ -4,6 +4,8 @@
 
 // Increase timeouts on this test which resolves source code and can be slow.
 @Timeout.factor(2.0)
+library test;
+
 import 'package:analyzer/dart/element/element.dart';
 import 'package:build_test/build_test.dart';
 import 'package:source_gen/src/utils.dart';

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-## 1.2.8-dev`
`2`		`-`
`3`	`1`	`## 1.2.7`
`4`	`2`
`5`	`3`	* Update the value of the pubspec `repository` field.