[ci] Cumulative fixes to reopen the tree. (#8344)

This PR fixes a couple of issues that have popped up in the CI of the tree in the last couple of days:

1. Disables some Android video_player tests that require network access.
2. Fixes our internal tool after a breaking change was made in an upstream dependency.

## Issues

* Mitigates flutter/flutter#160797
* Fixes flutter/flutter#160799

Author: ditman

packages/video_player/video_player/example/integration_test/video_player_test.dart

@@ -56,6 +56,15 @@ void main() {
     testWidgets(
       'live stream duration != 0',
       (WidgetTester tester) async {
+        // This test requires network access, and won't pass until a LUCI recipe
+        // change is made.
+        // TODO(camsim99): Remove once https://github.com/flutter/flutter/issues/160797 is fixed.
+        if (!kIsWeb && Platform.isAndroid) {
+          markTestSkipped(
+              'Skipping due to https://github.com/flutter/flutter/issues/160797');
+          return;
+        }
+
         final VideoPlayerController networkController =
             VideoPlayerController.networkUrl(
           Uri.parse(
@@ -266,6 +275,15 @@ void main() {
     testWidgets(
       'reports buffering status',
       (WidgetTester tester) async {
+        // This test requires network access, and won't pass until a LUCI recipe
+        // change is made.
+        // TODO(camsim99): Remove once https://github.com/flutter/flutter/issues/160797 is fixed.
+        if (!kIsWeb && Platform.isAndroid) {
+          markTestSkipped(
+              'Skipping due to https://github.com/flutter/flutter/issues/160797');
+          return;
+        }
+
         await controller.initialize();
         // Mute to allow playing without DOM interaction on Web.
         // See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes

script/tool/lib/src/common/package_looping_command.dart

@@ -340,7 +340,7 @@ abstract class PackageLoopingCommand extends PackageCommand {
     if (minFlutterVersion != null) {
       final Pubspec pubspec = package.parsePubspec();
       final VersionConstraint? flutterConstraint =
-          pubspec.environment?['flutter'];
+          pubspec.environment['flutter'];
       if (flutterConstraint != null &&
           !flutterConstraint.allows(minFlutterVersion)) {
         return PackageResult.skip(
@@ -350,7 +350,7 @@ abstract class PackageLoopingCommand extends PackageCommand {
 
     if (minDartVersion != null) {
       final Pubspec pubspec = package.parsePubspec();
-      final VersionConstraint? dartConstraint = pubspec.environment?['sdk'];
+      final VersionConstraint? dartConstraint = pubspec.environment['sdk'];
       if (dartConstraint != null && !dartConstraint.allows(minDartVersion)) {
         return PackageResult.skip('Does not support Dart $minDartVersion');
       }

script/tool/lib/src/create_all_packages_app_command.dart

@@ -277,7 +277,7 @@ dependencies {}
     final Pubspec originalPubspec = app.parsePubspec();
     const String dartSdkKey = 'sdk';
     final VersionConstraint dartSdkConstraint =
-        originalPubspec.environment?[dartSdkKey] ??
+        originalPubspec.environment[dartSdkKey] ??
             VersionConstraint.compatibleWith(
               Version.parse('3.0.0'),
             );
@@ -342,7 +342,7 @@ publish_to: none
 
 version: ${pubspec.version}
 
-environment:${_pubspecMapString(pubspec.environment!)}
+environment:${_pubspecMapString(pubspec.environment)}
 
 dependencies:${_pubspecMapString(pubspec.dependencies)}
 

script/tool/lib/src/pubspec_check_command.dart

@@ -488,9 +488,9 @@ class PubspecCheckCommand extends PackageLoopingCommand {
     }
 
     final Version? dartConstraintMin =
-        _minimumForConstraint(pubspec.environment?['sdk']);
+        _minimumForConstraint(pubspec.environment['sdk']);
     final Version? flutterConstraintMin =
-        _minimumForConstraint(pubspec.environment?['flutter']);
+        _minimumForConstraint(pubspec.environment['flutter']);
 
     // Validate the Flutter constraint, if any.
     if (flutterConstraintMin != null && minMinFlutterVersion != null) {

script/tool/lib/src/update_min_sdk_command.dart

@@ -87,7 +87,7 @@ class UpdateMinSdkCommand extends PackageLoopingCommand {
   /// Returns the given "environment" section's [key] constraint as a range,
   /// if the key is present and has a range.
   VersionRange? _sdkRange(Pubspec pubspec, String key) {
-    final VersionConstraint? constraint = pubspec.environment?[key];
+    final VersionConstraint? constraint = pubspec.environment[key];
     if (constraint is VersionRange) {
       return constraint;
     }

script/tool/pubspec.yaml

@@ -17,7 +17,7 @@ dependencies:
   path: ^1.8.3
   platform: ^3.0.2
   pub_semver: ^2.0.0
-  pubspec_parse: ^1.2.2
+  pubspec_parse: ^1.4.0
   quiver: ^3.0.1
   test: ^1.24.0
   uuid: ^4.5.1

script/tool/test/create_all_packages_app_command_test.dart

@@ -356,7 +356,7 @@ android {
       final Pubspec generatedPubspec = command.app.parsePubspec();
 
       const String dartSdkKey = 'sdk';
-      expect(generatedPubspec.environment?[dartSdkKey].toString(),
+      expect(generatedPubspec.environment[dartSdkKey].toString(),
           existingSdkConstraint);
     });
 

script/tool/test/update_min_sdk_command_test.dart

@@ -50,7 +50,7 @@ void main() {
     ]);
 
     final String dartVersion =
-        package.parsePubspec().environment?['sdk'].toString() ?? '';
+        package.parsePubspec().environment['sdk'].toString();
     expect(dartVersion, '^3.1.0');
   });
 
@@ -65,7 +65,7 @@ void main() {
     ]);
 
     final String dartVersion =
-        package.parsePubspec().environment?['sdk'].toString() ?? '';
+        package.parsePubspec().environment['sdk'].toString();
     expect(dartVersion, '^3.1.0');
   });
 
@@ -80,7 +80,7 @@ void main() {
     ]);
 
     final String dartVersion =
-        package.parsePubspec().environment?['sdk'].toString() ?? '';
+        package.parsePubspec().environment['sdk'].toString();
     expect(dartVersion, '^3.2.0');
   });
 
@@ -98,9 +98,9 @@ void main() {
     ]);
 
     final String dartVersion =
-        package.parsePubspec().environment?['sdk'].toString() ?? '';
+        package.parsePubspec().environment['sdk'].toString();
     final String flutterVersion =
-        package.parsePubspec().environment?['flutter'].toString() ?? '';
+        package.parsePubspec().environment['flutter'].toString();
     expect(dartVersion, '^3.1.0');
     expect(flutterVersion, '>=3.13.0');
   });
@@ -119,9 +119,9 @@ void main() {
     ]);
 
     final String dartVersion =
-        package.parsePubspec().environment?['sdk'].toString() ?? '';
+        package.parsePubspec().environment['sdk'].toString();
     final String flutterVersion =
-        package.parsePubspec().environment?['flutter'].toString() ?? '';
+        package.parsePubspec().environment['flutter'].toString();
     expect(dartVersion, '^3.2.0');
     expect(flutterVersion, '>=3.16.0');
   });