Pin git to 2.0.x

script/tool/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## NEXT
 
-* Updates dependencies to `git:^2.2.0`, `mockito:^5.3.2` and regenerates mocks.
+* Pins `package:git` dependency to `2.0.x` until `dart >=2.18.0` becomes our
+  oldest legacy.
+* Updates test mocks.
 
 ## 0.13.0
 

script/tool/pubspec.yaml

@@ -9,7 +9,8 @@ dependencies:
   collection: ^1.15.0
   colorize: ^3.0.0
   file: ^6.1.0
-  git: ^2.2.0
+  # Pin git to 2.0.x until dart >=2.18 is legacy
+  git: '>=2.0.0 <2.1.0'
   http: ^0.13.3
   http_multi_server: ^3.0.1
   meta: ^1.3.0
@@ -26,7 +27,7 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.0.3
   matcher: ^0.12.10
-  mockito: ^5.3.2
+  mockito: ^5.0.7
 
 environment:
   sdk: '>=2.12.0 <3.0.0'

script/tool/test/common/package_command_test.mocks.dart

@@ -225,26 +225,19 @@ class MockGitDir extends _i1.Mock implements _i5.GitDir {
   _i6.Future<_i4.ProcessResult> runCommand(
     Iterable<String>? args, {
     bool? throwOnError = true,
-    bool? echoOutput = false,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
           #runCommand,
           [args],
-          {
-            #throwOnError: throwOnError,
-            #echoOutput: echoOutput,
-          },
+          {#throwOnError: throwOnError},
         ),
         returnValue: _i6.Future<_i4.ProcessResult>.value(_FakeProcessResult_2(
           this,
           Invocation.method(
             #runCommand,
             [args],
-            {
-              #throwOnError: throwOnError,
-              #echoOutput: echoOutput,
-            },
+            {#throwOnError: throwOnError},
           ),
         )),
       ) as _i6.Future<_i4.ProcessResult>);
@@ -259,7 +252,7 @@ class MockGitDir extends _i1.Mock implements _i5.GitDir {
   @override
   _i6.Future<_i2.Commit?> updateBranch(
     String? branchName,
-    _i6.Future<void> Function(_i4.Directory)? populater,
+    _i6.Future<dynamic> Function(_i4.Directory)? populater,
     String? commitMessage,
   ) =>
       (super.noSuchMethod(