[Backpatch to v3] Widen analyzer range to allow v1 (#1082)

evanweible-wf · web-flow · commit 6cef1eb6cd5f · 2022-01-05T16:41:01.000-08:00
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/_test_yaml/mono_pkg.yaml b/_test_yaml/mono_pkg.yaml
@@ -1,17 +1,13 @@
 # See https://github.com/google/mono_repo.dart for details on this file
 dart:
-- 2.7.0
-- dev
+- 2.13.4
 
 stages:
 - analyzer_and_format:
   - group:
-    - dartfmt
-    - dartanalyzer: --fatal-warnings --fatal-infos .
-    dart: [dev]
-  - group:
-    - dartanalyzer: --fatal-warnings .
-    dart: [2.7.0]
+    - format
+    - analyze: --fatal-warnings --fatal-infos .
+    dart: [2.13.4]
 - unit_test:
   - test
 - ensure_build:
diff --git a/_test_yaml/pubspec.yaml b/_test_yaml/pubspec.yaml
@@ -10,6 +10,7 @@ dev_dependencies:
   checked_yaml: any
   json_annotation: any
   json_serializable: any
+  meta: ">=1.2.2 <1.7.0" # Workaround to avoid https://github.com/dart-lang/sdk/issues/46142
   test: ^1.6.0
 
 dependency_overrides:
diff --git a/checked_yaml/mono_pkg.yaml b/checked_yaml/mono_pkg.yaml
@@ -1,17 +1,13 @@
 # See https://github.com/google/mono_repo.dart for details on this file
 dart:
-- 2.7.0
-- dev
+- 2.13.4
 
 stages:
 - analyzer_and_format:
   - group:
-    - dartfmt
-    - dartanalyzer: --fatal-warnings --fatal-infos .
-    dart: [dev]
-  - group:
-    - dartanalyzer: --fatal-warnings .
-    dart: [2.7.0]
+    - format
+    - analyze: --fatal-warnings --fatal-infos .
+    dart: [2.13.4]
 
 - unit_test:
   - test
diff --git a/checked_yaml/pubspec.yaml b/checked_yaml/pubspec.yaml
@@ -16,6 +16,7 @@ dev_dependencies:
   build_runner: ^1.0.0
   build_verify: ^1.1.0
   json_serializable: ^3.0.0
+  meta: ">=1.2.2 <1.7.0" # Workaround to avoid https://github.com/dart-lang/sdk/issues/46142
   path: ^1.0.0
   test: ^1.6.0
   test_process: ^1.0.1
diff --git a/example/mono_pkg.yaml b/example/mono_pkg.yaml
@@ -1,17 +1,17 @@
 # See https://github.com/google/mono_repo.dart for details on this file
 dart:
-- 2.7.0
-- dev
+- 2.13.4
+- stable
 
 stages:
 - analyzer_and_format:
   - group:
-    - dartfmt
-    - dartanalyzer: --fatal-warnings --fatal-infos .
-    dart: [dev]
+    - analyze: --fatal-warnings --fatal-infos .
+    dart: [stable]
   - group:
-    - dartanalyzer: --fatal-warnings .
-    dart: [2.7.0]
+    - format
+    - analyze: --fatal-warnings .
+    dart: [2.13.4]
 - unit_test:
   - test
 - ensure_build:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -24,3 +24,11 @@ dependency_overrides:
     path: ../json_annotation
   json_serializable:
     path: ../json_serializable
+  # Normally pubspec_parse would be constrained to <1.0.0 because of this
+  # package's constraint on json_annotation ^3.0.0, but because json_annotation
+  # is also overridden here, that does not happen, and pubspec_parse would
+  # otherwise resolve to v1 which will fail. To avoid that issue, we override
+  # pubspec_parse here, but note that this is not representative of a consumer
+  # would actually need to do – depending on json_annotation ^3.0.0 is
+  # sufficient for consumers.
+  pubspec_parse: <1.0.0
diff --git a/json_annotation/mono_pkg.yaml b/json_annotation/mono_pkg.yaml
@@ -2,9 +2,9 @@
 stages:
 - analyzer_and_format:
   - group:
-    - dartfmt
-    - dartanalyzer: --fatal-warnings --fatal-infos .
-    dart: [dev]
+    - analyze: --fatal-warnings --fatal-infos .
+    dart: [stable]
   - group:
-    - dartanalyzer: --fatal-warnings .
-    dart: [2.7.0]
+    - format
+    - analyze: --fatal-warnings .
+    dart: [2.13.4]
diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.5.2
+
+- Widen `package:analyzer` range to allow v1.x.
+
 ## 3.5.1
 
 - Improved error messages for unsupported types.
diff --git a/json_serializable/mono_pkg.yaml b/json_serializable/mono_pkg.yaml
@@ -1,17 +1,17 @@
 # See https://github.com/google/mono_repo.dart for details on this file
 dart:
-- 2.7.0
-- dev
+- 2.13.4
+- stable
 
 stages:
 - analyzer_and_format:
   - group:
-    - dartfmt
-    - dartanalyzer: --fatal-warnings --fatal-infos .
-    dart: [dev]
+    - analyze: --fatal-warnings .
+    dart: [stable]
   - group:
-    - dartanalyzer: --fatal-warnings .
-    dart: [2.7.0]
+    - format
+    - analyze: --fatal-warnings .
+    dart: [2.13.4]
 - unit_test:
   - test
   - test: -p chrome
diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml
@@ -1,16 +1,16 @@
 name: json_serializable
-version: 3.5.1
+version: 3.5.2
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.
 repository: https://github.com/google/json_serializable.dart
 environment:
-  sdk: '>=2.7.0 <3.0.0'
+  sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: '>=0.39.0 <0.42.0'
-  build: '>=0.12.6 <2.0.0'
-  build_config: '>=0.2.6 <0.5.0'
+  analyzer: '>=0.39.0 <2.0.0'
+  build: '>=0.12.6 <3.0.0'
+  build_config: '>=0.2.6 <2.0.0'
 
   # Use a tight version constraint to ensure that a constraint on
   # `json_annotation` properly constrains all features it provides.
@@ -23,11 +23,11 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^1.0.0
-  build_verify: ^1.1.0
+  build_verify: ^2.0.0
   collection: ^1.14.0
-  dart_style: ^1.2.0
-  logging: ^0.11.3+1
-  pub_semver: ^1.4.0
+  dart_style: ^1.0.0
+  logging: ^1.0.0
+  pub_semver: ^2.0.0
   source_gen_test: ^0.1.0
   test: ^1.6.0
-  yaml: ^2.1.13
+  yaml: ^3.0.0
diff --git a/json_serializable/test/kitchen_sink/kitchen_sink_test.dart b/json_serializable/test/kitchen_sink/kitchen_sink_test.dart
@@ -177,7 +177,7 @@ void _nullableTests(KitchenSinkFactory factory) {
 void _anyMapTests(KitchenSinkFactory factory) {
   test('valid values round-trip - yaml', () {
     final jsonEncoded = loudEncode(_validValues);
-    final yaml = loadYaml(jsonEncoded, sourceUrl: 'input.yaml');
+    final yaml = loadYaml(jsonEncoded, sourceUrl: Uri.parse('input.yaml'));
     expect(jsonEncoded, loudEncode(factory.fromJson(yaml as YamlMap)));
   });
 
diff --git a/json_serializable/tool/shared.dart b/json_serializable/tool/shared.dart
@@ -12,7 +12,7 @@ import 'package:yaml/yaml.dart';
 Builder validate(String builderName, Builder builder) {
   var buildYaml = loadYaml(
     File('build.yaml').readAsStringSync(),
-    sourceUrl: 'build.yaml',
+    sourceUrl: Uri.parse('build.yaml'),
   ) as YamlMap;
 
   for (var key in ['builders', builderName, 'build_extensions']) {
diff --git a/tool/ci.sh b/tool/ci.sh
@@ -1,26 +1,35 @@
 #!/bin/bash
-# Created with package:mono_repo v3.3.0
+# Created with package:mono_repo v5.0.0
 
 # Support built in commands on windows out of the box.
+# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
+# then "flutter" is called instead of "pub".
+# This assumes that the Flutter SDK has been installed in a previous step.
 function pub() {
-  if [[ $TRAVIS_OS_NAME == "windows" ]]; then
-    command pub.bat "$@"
+  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
+    command flutter pub "$@"
   else
-    command pub "$@"
+    command dart pub "$@"
   fi
 }
-function dartfmt() {
-  if [[ $TRAVIS_OS_NAME == "windows" ]]; then
-    command dartfmt.bat "$@"
+# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
+# then "flutter" is called instead of "pub".
+# This assumes that the Flutter SDK has been installed in a previous step.
+function format() {
+  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
+    command flutter format "$@"
   else
-    command dartfmt "$@"
+    command dart format "$@"
   fi
 }
-function dartanalyzer() {
-  if [[ $TRAVIS_OS_NAME == "windows" ]]; then
-    command dartanalyzer.bat "$@"
+# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")
+# then "flutter" is called instead of "pub".
+# This assumes that the Flutter SDK has been installed in a previous step.
+function analyze() {
+  if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then
+    command flutter analyze "$@"
   else
-    command dartanalyzer "$@"
+    command dart analyze "$@"
   fi
 }
 
@@ -47,40 +56,40 @@ for PKG in ${PKGS}; do
     exit 64
   fi
 
-  pub upgrade --no-precompile || EXIT_CODE=$?
+  dart pub upgrade || EXIT_CODE=$?
 
   if [[ ${EXIT_CODE} -ne 0 ]]; then
-    echo -e "\033[31mPKG: ${PKG}; 'pub upgrade' - FAILED  (${EXIT_CODE})\033[0m"
-    FAILURES+=("${PKG}; 'pub upgrade'")
+    echo -e "\033[31mPKG: ${PKG}; 'dart pub upgrade' - FAILED  (${EXIT_CODE})\033[0m"
+    FAILURES+=("${PKG}; 'dart pub upgrade'")
   else
     for TASK in "$@"; do
       EXIT_CODE=0
       echo
       echo -e "\033[1mPKG: ${PKG}; TASK: ${TASK}\033[22m"
       case ${TASK} in
-      dartanalyzer_0)
-        echo 'dartanalyzer --fatal-warnings --fatal-infos .'
-        dartanalyzer --fatal-warnings --fatal-infos . || EXIT_CODE=$?
+      analyze_0)
+        echo 'dart analyze --fatal-warnings --fatal-infos .'
+        dart analyze --fatal-warnings --fatal-infos . || EXIT_CODE=$?
         ;;
-      dartanalyzer_1)
-        echo 'dartanalyzer --fatal-warnings .'
-        dartanalyzer --fatal-warnings . || EXIT_CODE=$?
+      analyze_1)
+        echo 'dart analyze --fatal-warnings .'
+        dart analyze --fatal-warnings . || EXIT_CODE=$?
         ;;
-      dartfmt)
-        echo 'dartfmt -n --set-exit-if-changed .'
-        dartfmt -n --set-exit-if-changed . || EXIT_CODE=$?
+      format)
+        echo 'dart format --output=none --set-exit-if-changed .'
+        dart format --output=none --set-exit-if-changed . || EXIT_CODE=$?
         ;;
       test_0)
-        echo 'pub run test'
-        pub run test || EXIT_CODE=$?
+        echo 'dart test'
+        dart test || EXIT_CODE=$?
         ;;
       test_1)
-        echo 'pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart'
-        pub run test --run-skipped -t presubmit-only test/ensure_build_test.dart || EXIT_CODE=$?
+        echo 'dart test --run-skipped -t presubmit-only test/ensure_build_test.dart'
+        dart test --run-skipped -t presubmit-only test/ensure_build_test.dart || EXIT_CODE=$?
         ;;
       test_2)
-        echo 'pub run test -p chrome'
-        pub run test -p chrome || EXIT_CODE=$?
+        echo 'dart test -p chrome'
+        dart test -p chrome || EXIT_CODE=$?
         ;;
       *)
         echo -e "\033[31mUnknown TASK '${TASK}' - TERMINATING JOB\033[0m"
