Allow analyzer 1.0

.github/workflows/dart_ci.yml

@@ -81,6 +81,35 @@ jobs:
         run: dart pub run dart_dev test --build-args="-r" -P dart2js
         if: always() && steps.install.outcome == 'success' && steps.build.outcome == 'success'
 
+  validate_analyzer:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sdk: [ 2.13.4, stable ]
+        analyzer:
+          - ^0.40.0
+          - ^0.41.0
+          # No ^0.42.0 since that line only contains 0.42.0-nullsafety.0, which is the 1.0.0 prerelease
+          - ^1.0.0
+        # For stable, only validate analyzer ^1.0.0. Otherwise, validate all analyzer versions.
+        exclude:
+          - sdk: stable
+        include:
+          - sdk: stable
+            analyzer: ^1.0.0
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dart-lang/setup-dart@v0.2
+        with:
+          sdk: ${{ matrix.sdk }}
+
+      - name: Print Dart SDK version
+        run: dart --version
+
+      - name: Validate dependency resolution, static analysis, and builder when using analyzer ${{ matrix.analyzer }}
+        run: ./tool/validate_analyzer_version.sh "${{ matrix.analyzer }}"
+
   analyzer_plugin:
     runs-on: ubuntu-latest
     defaults:

lib/src/builder/builder.dart

@@ -139,7 +139,7 @@ class OverReactBuilder extends Builder {
 
     // Generate over_react code for each part file of the input library.
     for (final part in parts) {
-      final partId = AssetId.resolve(
+      final partId = resolveAssetId(
         part.uri.stringValue,
         from: buildStep.inputId);
       if (!await buildStep.canRead(partId)) {
@@ -222,3 +222,24 @@ class OverReactBuilder extends Builder {
     await buildStep.writeAsString(outputId, output);
   }
 }
+
+/// A compatibility layer for [AssetId.resolve],
+/// which in build <2.0.0 accepts a String for the first argument and
+/// and in build >=2.0.0 accepts a Uri for the first argument.
+///
+/// This function allows us to support build 1.x and 2.x
+///
+// TODO remove once we're off of build 1.x
+AssetId resolveAssetId(String uri, {AssetId from}) {
+  try {
+    // `as dynamic` is necessary to prevent compile errors.
+    // This ignore is to prevent analysis implicit cast errors.
+    // ignore: argument_type_not_assignable
+    return AssetId.resolve(uri as dynamic, from: from);
+  } catch (_) {
+    // `as dynamic` is necessary to prevent compile errors.
+    // This ignore is to prevent analysis implicit cast errors.
+    // ignore: argument_type_not_assignable
+    return AssetId.resolve(Uri.parse(uri) as dynamic, from: from);
+  }
+}

pubspec.yaml

@@ -7,14 +7,11 @@ environment:
 
 dependencies:
   collection: ^1.14.11
-  # Dart 2.7 needs 0.39.x to resolve,
-  # and Dart 2.12+ needs 0.42.x to resolve to build_web_compilers 2.12.0, etc.
-  # to enable proper opting out of null-safety.
-  analyzer: '>=0.39.0 <0.42.0'
+  analyzer: '>=0.40.0 <2.0.0'
   build: '>=1.0.0 <3.0.0'
   built_redux: ^7.4.2
   built_value: ^8.0.0
-  dart_style: ^1.2.5
+  dart_style: '>=1.2.5 <3.0.0'
   js: ^0.6.1+1
   logging: '>=0.11.3+2 <2.0.0'
   meta: ">=1.1.6 <1.7.0" # Workaround to avoid https://github.com/dart-lang/sdk/issues/46142
@@ -26,24 +23,24 @@ dependencies:
   w_common: ^1.13.0
   w_flux: ^2.10.4
   platform_detect: ^1.3.4
-  quiver: ">=0.25.0 <3.0.0"
+  quiver: ">=0.25.0 <4.0.0"
   redux_dev_tools: ">=0.4.0 <0.6.0"
 
 dev_dependencies:
-  build_resolvers: ^1.0.5
+  build_resolvers: '>=1.0.5 <3.0.0'
   build_runner: '>=1.7.1 <3.0.0'
-  build_test: ">=0.10.9 <2.0.0"
-  build_web_compilers: ^2.5.1
+  build_test: ">=0.10.9 <3.0.0"
+  build_web_compilers: '>=2.12.0 <4.0.0'
   built_value_generator: ^8.0.0
   dart_dev: ^3.6.4
-  dependency_validator: ^2.0.0
-  glob: ^1.2.0
-  io: ^0.3.2+1
+  dependency_validator: '>=2.0.0 <4.0.0'
+  glob: '>=1.2.0<3.0.0'
+  io: '>=0.3.2+1 <2.0.0'
   mockito: ^4.1.1
   over_react_test: ^2.10.2
   pedantic: ^1.8.0
   test: ^1.15.7
-  yaml: ^2.2.1
+  yaml: '>=2.2.1 <4.0.0'
 
 workiva:
   core_checks:

tool/set_analyzer_constraint.dart

@@ -0,0 +1,25 @@
+import 'dart:io';
+
+final analyzerConstraintPattern =
+    RegExp(r'^( +analyzer:\s*).+', multiLine: true);
+
+void main(List<String> args) {
+  if (args.length != 1) {
+    throw ArgumentError(
+        'Expected a single arg for the new analyzer constraint. Args: $args');
+  }
+  final newAnalyzerConstraint = args.single;
+
+  final pubspec = File('pubspec.yaml');
+  final pubspecContents = pubspec.readAsStringSync();
+
+  final matches = analyzerConstraintPattern.allMatches(pubspecContents);
+  if (matches.length != 1) {
+    throw Exception(
+        'Expected 1 analyzer dependency match in ${pubspec.path}, but found ${matches.length}.');
+  }
+
+  pubspec.writeAsStringSync(pubspecContents.replaceFirstMapped(
+      analyzerConstraintPattern,
+      (match) => '${match.group(1)}$newAnalyzerConstraint'));
+}

tool/validate_analyzer_version.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Fail this script if any command fails
+set -e
+# Print commands as they run
+set -x
+
+analyzer_constraint="$1"
+
+echo "Validating analyzer version constraint: $analyzer_constraint"
+
+# sed -i is not portable, so we write to a separate file: https://unix.stackexchange.com/a/92907
+dart tool/set_analyzer_constraint.dart "$analyzer_constraint"
+
+pub get
+
+dart analyze .
+
+# Verify the over_react builder runs without errors, since the builder itself isn't fully covered by tests.
+dart run build_runner build --build-filter='**.dart' --delete-conflicting-outputs
+
+dart run test -p vm -- test/vm_tests/builder

tools/analyzer_plugin/playground/pubspec.yaml

@@ -6,7 +6,7 @@ dependencies:
   over_react: ^3.5.3
 dev_dependencies:
   build_runner: '>=1.0.0 <3.0.0'
-  build_web_compilers: ^2.0.0
+  build_web_compilers: '>=2.0.0 <4.0.0'
   workiva_analysis_options: ^1.1.0
 
 dependency_overrides: