From a99c2655e32f2be67f217258bb6173beb0a6fe51 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Wed, 23 Oct 2024 17:26:41 -0700
Subject: [PATCH] Fix tests affected by pkg:args changes

---
 build_cli/pubspec.yaml                      | 2 +-
 build_cli/test/peanut_integration_test.dart | 4 ++--
 build_cli/test/pubviz_integration_test.dart | 7 +++++--
 build_cli_annotations/CHANGELOG.md          | 1 +
 build_cli_annotations/pubspec.yaml          | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build_cli/pubspec.yaml b/build_cli/pubspec.yaml
index ff1193f..d4c8edf 100644
--- a/build_cli/pubspec.yaml
+++ b/build_cli/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
 dev_dependencies:
   # Args is exported and restricted by `build_cli_annotation`, but tests in this
   # package assume the output of features in ^2.0.0
-  args: ^2.0.0
+  args: ^2.6.0
   build_runner: ^2.4.6
   build_verify: ^3.0.0
   dart_flutter_team_lints: ^3.0.0
diff --git a/build_cli/test/peanut_integration_test.dart b/build_cli/test/peanut_integration_test.dart
index 4018bc8..99b0b4d 100644
--- a/build_cli/test/peanut_integration_test.dart
+++ b/build_cli/test/peanut_integration_test.dart
@@ -57,8 +57,8 @@ void main() {
 
   group('with invalid args', () {
     final items = {
-      'Cannot negate option "no-help".': ['--no-help'],
-      '"foo" is not an allowed value for option "mode".': ['--mode', 'foo'],
+      'Cannot negate option "--no-help".': ['--no-help'],
+      '"foo" is not an allowed value for option "--mode".': ['--mode', 'foo'],
       'The value provided for "max-runtime" – "bob" – was not a number.': [
         '--max-runtime',
         'bob',
diff --git a/build_cli/test/pubviz_integration_test.dart b/build_cli/test/pubviz_integration_test.dart
index 8ec2477..907c85e 100644
--- a/build_cli/test/pubviz_integration_test.dart
+++ b/build_cli/test/pubviz_integration_test.dart
@@ -16,8 +16,11 @@ void main() {
 
   group('with invalid args', () {
     final items = {
-      'Could not find an option named "no-help".': ['--no-help'],
-      '"foo" is not an allowed value for option "format".': ['--format', 'foo'],
+      'Could not find an option named "--no-help".': ['--no-help'],
+      '"foo" is not an allowed value for option "--format".': [
+        '--format',
+        'foo'
+      ],
       'Cannot parse "3.14" into `int` for option "production-port".': [
         '--production-port',
         '3.14',
diff --git a/build_cli_annotations/CHANGELOG.md b/build_cli_annotations/CHANGELOG.md
index 83e8bd6..b242a84 100644
--- a/build_cli_annotations/CHANGELOG.md
+++ b/build_cli_annotations/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 2.1.1-wip
 
+- Require `args: ^2.6.0`
 - Require `sdk: ^3.5.0`
 
 ## 2.1.0
diff --git a/build_cli_annotations/pubspec.yaml b/build_cli_annotations/pubspec.yaml
index 14957c2..9e5415b 100644
--- a/build_cli_annotations/pubspec.yaml
+++ b/build_cli_annotations/pubspec.yaml
@@ -13,6 +13,6 @@ resolution: workspace
 
 dependencies:
   # Limit version range on args – it's exported
-  args: '>=2.0.0 <3.0.0'
+  args: ^2.6.0
   dart_flutter_team_lints: ^3.0.0
   meta: ^1.7.0