Manual Roll of Flutter Engine from 67254d6e4b03 to 8d83b98c55b3 (#116635)

* Roll Flutter Engine from 67254d6e4b03 to 8d83b98c55b3

* Roll Dart SDK from 35a9facce191 to e517487c5679 (Dart 3.0) (#38105)

* Bump SDK versions.

* Bump Dart SDK version constraints

* Update shrine package to 2.0.1 (null safe version)

* Fix more tests.

* Include patches from Jason for min android sdk version

* Fix analyzer warning

bin/internal/engine.version

-67254d6e4b0369fa83418cf9e9ff68b21c529765
+8d83b98c55b3d0839de0c4201f5a8d56dbf92d2f

dev/automated_tests/pubspec.yaml

 name: flutter_automated_tests
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/complex_layout/pubspec.yaml

@@ -2,7 +2,7 @@ name: complex_layout
 description: A benchmark of a relatively complex layout.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/macrobenchmarks/pubspec.yaml

@@ -2,7 +2,7 @@ name: macrobenchmarks
 description: Performance benchmarks using flutter drive.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/microbenchmarks/pubspec.yaml

@@ -2,7 +2,7 @@ name: microbenchmarks
 description: Small benchmarks for very specific parts of the Flutter framework.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   meta: 1.8.0

dev/benchmarks/multiple_flutters/module/pubspec.yaml

@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters benchmark test.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/platform_channels_benchmarks/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/platform_views_layout/pubspec.yaml

@@ -2,7 +2,7 @@ name: platform_views_layout
 description: A benchmark for platform views.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml

@@ -2,7 +2,7 @@ name: platform_views_layout_hybrid_composition
 description: A benchmark for platform views, using hybrid composition on android.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/benchmarks/test_apps/stocks/pubspec.yaml

 name: stocks
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/bots/pubspec.yaml

@@ -2,7 +2,7 @@ name: tests_on_bots
 description: Scripts which run on bots.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   args: 2.3.1

dev/conductor/core/pubspec.yaml

@@ -4,7 +4,7 @@ description: Flutter Automated Release Tool
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   archive: 3.3.2

dev/customer_testing/pubspec.yaml

@@ -2,7 +2,7 @@ name: customer_testing
 description: Tool to run the tests listed in the flutter/tests repository.
 
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   args: 2.3.1

dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart

@@ -15,7 +15,8 @@ Future<void> main() async {
     try {
       await runProjectTest((FlutterProject flutterProject) async {
         section('APK contains plugin classes');
-        flutterProject.addPlugin('google_maps_flutter', value: '^1.0.10');
+        await flutterProject.setMinSdkVersion(20);
+        flutterProject.addPlugin('google_maps_flutter', value: '^2.2.1');
 
         await inDirectory(flutterProject.rootPath, () async {
           await flutter('build', options: <String>[

dev/devicelab/bin/tasks/module_test_ios.dart

@@ -170,7 +170,7 @@ Future<void> main() async {
         '''
 dependencies:
   url_launcher: 6.0.20
-  android_alarm_manager: 0.4.5+11
+  android_alarm_manager: 2.0.2
   google_sign_in_ios: 5.5.0
   $dartPluginName:
     path: ../$dartPluginName

dev/devicelab/bin/tasks/plugin_dependencies_test.dart

@@ -101,7 +101,7 @@ dependencies:
     sdk: flutter
 
 environment:
-  sdk: ">=2.0.0-dev.28.0 <3.0.0"
+  sdk: ">=2.0.0-dev.28.0 <4.0.0"
   flutter: ">=1.5.0"
 ''', flush: true);
 

dev/devicelab/lib/framework/apk_utils.dart

@@ -287,6 +287,20 @@ android {
     pubspec.writeAsStringSync(content, flush: true);
   }
 
+  Future<void> setMinSdkVersion(int sdkVersion) async {
+    final File buildScript = File(
+      path.join(androidPath, 'app', 'build.gradle'),
+    );
+
+    buildScript.openWrite(mode: FileMode.append).write('''
+android {
+    defaultConfig {
+        minSdkVersion $sdkVersion
+    }
+}
+    ''');
+  }
+
   Future<void> getPackages() async {
     await inDirectory(Directory(rootPath), () async {
       await flutter('pub', options: <String>['get']);

dev/devicelab/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter continuous integration performance and correctness tests.
 homepage: https://github.com/flutter/flutter
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   archive: 3.3.2

dev/docs/platform_integration/pubspec.yaml

 name: platform_integration
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"

dev/forbidden_from_release_tests/pubspec.yaml

@@ -2,7 +2,7 @@ name: forbidden_from_release_tests
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   args: 2.3.1

dev/integration_tests/abstract_method_smoke_test/pubspec.yaml

@@ -4,7 +4,7 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml

@@ -14,7 +14,7 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/android_semantics_testing/pubspec.yaml

 name: android_semantics_testing
 description: Integration testing library for Android semantics
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   flutter:

dev/integration_tests/android_views/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: none
 description: An integration test for embedded platform views
 version: 1.0.0+1
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   flutter:

dev/integration_tests/channels/pubspec.yaml

@@ -2,7 +2,7 @@ name: channels
 description: Integration test for platform channels.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/deferred_components_test/pubspec.yaml

@@ -3,7 +3,7 @@ description: Integration test application for basic deferred components function
 publish_to: 'none'
 version: 1.0.0+1
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   flutter:

dev/integration_tests/external_ui/pubspec.yaml

@@ -2,7 +2,7 @@ name: external_ui
 description: A test of Flutter integrating external UIs.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/flavors/pubspec.yaml

@@ -2,7 +2,7 @@ name: flavors
 description: Integration test for build flavors.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/flutter_gallery/pubspec.yaml

 name: flutter_gallery
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:
@@ -20,7 +20,7 @@ dependencies:
     git:
       url: https://github.com/kevmoo/scoped_model.git
       ref: null_safety
-  shrine_images: 1.1.2
+  shrine_images: 2.0.1
 
   # Also update dev/benchmarks/complex_layout/pubspec.yaml
   # and dev/benchmarks/macrobenchmarks/pubspec.yaml

dev/integration_tests/gradle_deprecated_settings/pubspec.yaml

@@ -2,7 +2,7 @@ name: gradle_deprecated_settings
 description: Integration test for the current settings.gradle.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/hybrid_android_views/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: none
 description: An integration test for hybrid composition on Android
 version: 1.0.0+1
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   flutter:

dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml

@@ -14,7 +14,7 @@ description: A new flutter module project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/ios_app_with_extensions/pubspec.yaml

@@ -13,7 +13,7 @@ name: ios_app_with_extensions
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/ios_platform_view_tests/pubspec.yaml

@@ -3,7 +3,7 @@ name: ios_platform_view_tests
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/non_nullable/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/platform_interaction/pubspec.yaml

@@ -2,7 +2,7 @@ name: platform_interaction
 description: Integration test for platform interactions.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/release_smoke_test/pubspec.yaml

 name: release_smoke_test
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/spell_check/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.0-149.0.dev <3.0.0'
+  sdk: '>=2.18.0-149.0.dev <4.0.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions

dev/integration_tests/ui/pubspec.yaml

@@ -2,7 +2,7 @@ name: integration_ui
 description: Flutter non-plugin UI integration tests.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/integration_tests/web/pubspec.yaml

@@ -2,7 +2,7 @@ name: web_integration
 description: Integration test for web compilation.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 flutter:
   assets:

dev/integration_tests/web_compile_tests/pubspec.yaml

 name: web_compile_tests
 environment:
-  sdk: '>=2.17.0-0 <3.0.0'
+  sdk: '>=2.17.0-0 <4.0.0'
 
 dependencies:
   flutter:

dev/integration_tests/web_e2e_tests/pubspec.yaml

@@ -2,7 +2,7 @@ name: web_e2e_tests
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 flutter:
   assets:

dev/integration_tests/windows_startup_test/pubspec.yaml

@@ -2,7 +2,7 @@ name: windows_startup_test
 description: Integration test for Windows app's startup.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/manual_tests/pubspec.yaml

 name: manual_tests
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/missing_dependency_tests/pubspec.yaml

 name: missing_dependency_tests
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/tools/dartdoc.dart

@@ -59,7 +59,7 @@ Future<void> main(List<String> arguments) async {
   buf.writeln('homepage: https://flutter.dev');
   buf.writeln('version: 0.0.0');
   buf.writeln('environment:');
-  buf.writeln("  sdk: '>=2.10.0 <3.0.0'");
+  buf.writeln("  sdk: '>=2.10.0 <4.0.0'");
   buf.writeln('dependencies:');
   for (final String package in findPackageNames()) {
     buf.writeln('  $package:');

dev/tools/gen_defaults/pubspec.yaml

@@ -3,7 +3,7 @@ description: A command line script to generate Material component defaults from
 version: 1.0.0
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
 

dev/tools/gen_keycodes/pubspec.yaml

@@ -2,7 +2,7 @@ name: gen_keycodes
 description: Generates keycode source files from various resources.
 
 environment:
-  sdk: ">=2.18.0-0 <3.0.0"
+  sdk: ">=2.18.0-0 <4.0.0"
 
 dependencies:
   args: 2.3.1

dev/tools/pubspec.yaml

@@ -2,7 +2,7 @@ name: dev_tools
 description: Various repository development tools for flutter.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   archive: 3.3.2

dev/tools/vitool/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 homepage: https://flutter.dev
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

dev/tracing_tests/pubspec.yaml

@@ -2,7 +2,7 @@ name: tracing_tests
 description: Various tests for tracing in flutter/flutter
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/api/pubspec.yaml

@@ -7,7 +7,7 @@ publish_to: 'none'
 version: 1.0.0
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
   flutter: ">=2.5.0-6.0.pre.30 <3.0.0"
 
 dependencies:

examples/flutter_view/pubspec.yaml

@@ -2,7 +2,7 @@ name: flutter_view
 description: A new flutter project.
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/hello_world/pubspec.yaml

 name: hello_world
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/image_list/pubspec.yaml

@@ -4,7 +4,7 @@ description: Simple Flutter project used for benchmarking image loading over net
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/layers/pubspec.yaml

 name: flutter_examples_layers
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/platform_channel/pubspec.yaml

 name: platform_channel
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/platform_channel_swift/pubspec.yaml

 name: platform_channel_swift
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/platform_view/pubspec.yaml

 name: platform_view
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

examples/splash/pubspec.yaml

 name: splash
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

packages/flutter/pubspec.yaml

@@ -3,7 +3,7 @@ description: A framework for writing Flutter applications
 homepage: https://flutter.dev
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter/test_private/pubspec.yaml

@@ -2,7 +2,7 @@ name: flutter_test_private
 description: Tests private interfaces of the flutter
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter/test_private/test/pubspec.yaml

 name: animated_icons_private_test
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_driver/pubspec.yaml

@@ -3,7 +3,7 @@ description: Integration and performance test API for Flutter applications
 homepage: https://flutter.dev
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   file: 6.1.4

packages/flutter_goldens/pubspec.yaml

 name: flutter_goldens
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_goldens_client/pubspec.yaml

 name: flutter_goldens_client
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_localizations/pubspec.yaml

 name: flutter_localizations
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_test/pubspec.yaml

 name: flutter_test
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_test/test/test_config/project_root/pubspec.yaml

@@ -4,6 +4,6 @@
 name: dummy
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 
 # PUBSPEC CHECKSUM: 0000

packages/flutter_tools/lib/src/commands/update_packages.dart

@@ -1427,7 +1427,7 @@ String generateFakePubspec(
   final bool verbose = doUpgrade;
   result.writeln('name: flutter_update_packages');
   result.writeln('environment:');
-  result.writeln("  sdk: '>=2.10.0 <3.0.0'");
+  result.writeln("  sdk: '>=2.10.0 <4.0.0'");
   result.writeln('dependencies:');
   overrides.writeln('dependency_overrides:');
   if (kManuallyPinnedDependencies.isNotEmpty) {
@@ -1640,7 +1640,7 @@ Directory createTemporaryFlutterSdk(
     // Fill in SDK dependency constraint.
     output.write('''
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.7.0 <4.0.0"
 ''');
 
     output.writeln('dependencies:');
@@ -1672,7 +1672,7 @@ description: Dart SDK extensions for dart:ui
 homepage: http://flutter.io
 # sky_engine requires sdk_ext support in the analyzer which was added in 1.11.x
 environment:
-  sdk: '>=1.11.0 <3.0.0'
+  sdk: '>=1.11.0 <4.0.0'
 ''');
 
   return directory;

packages/flutter_tools/pubspec.yaml

@@ -3,7 +3,7 @@ description: Tools for building Flutter applications
 homepage: https://flutter.dev
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart

@@ -60,7 +60,7 @@ void main() {
     pubspecFile.writeAsStringSync('''
   name: foo_project
   environment:
-    sdk: '>=2.10.0 <3.0.0'
+    sdk: '>=2.10.0 <4.0.0'
   ''');
 
     final File dartFile = fileSystem.file(fileSystem.path.join(directory.path, 'lib', 'main.dart'));

packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart

@@ -24,7 +24,7 @@ description: A framework for writing Flutter applications
 homepage: http://flutter.dev
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.2.2 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".
@@ -61,7 +61,7 @@ homepage: http://flutter.dev
 version: 1.0.0
 
 environment:
-  sdk: ">=2.14.0-383.0.dev <3.0.0"
+  sdk: ">=2.14.0-383.0.dev <4.0.0"
   flutter: ">=2.5.0-6.0.pre.30 <3.0.0"
 
 dependencies:

packages/flutter_tools/test/data/asset_test/font/pubspec.yaml

@@ -2,7 +2,7 @@ name: font
 description: A test project that contains a font.
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
 
 flutter:
   uses-material-design: true

packages/flutter_tools/test/data/asset_test/main/pubspec.yaml

@@ -2,7 +2,7 @@ name: main
 description: A test project that has a package with a font as a dependency.
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
   font:

packages/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart

@@ -86,7 +86,7 @@ flutter:
         pluginClass: none
 
 environment:
-  sdk: ">=2.12.0-259.9.beta <3.0.0"
+  sdk: ">=2.12.0-259.9.beta <4.0.0"
   flutter: ">=1.20.0"
 ''';
 

packages/flutter_tools/test/general.shard/test/test_compiler_test.dart

@@ -166,7 +166,7 @@ flutter:
       linux:
         dartPluginClass: APlugin
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.14.0 <4.0.0"
   flutter: ">=2.5.0"
 ''');
 

packages/flutter_tools/test/general.shard/update_packages_test.dart

@@ -17,7 +17,7 @@ description: A framework for writing Flutter applications
 homepage: http://flutter.dev
 
 environment:
-  sdk: '>=2.2.2 <3.0.0'
+  sdk: '>=2.2.2 <4.0.0'
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".
@@ -51,7 +51,7 @@ description: A dummy pubspec with no dependencies
 homepage: http://flutter.dev
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.2.2 <4.0.0"
 ''';
 
 const String kInvalidGitPubspec = '''
@@ -60,7 +60,7 @@ description: A framework for writing Flutter applications
 homepage: http://flutter.dev
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.2.2 <4.0.0"
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".

packages/flutter_tools/test/integration.shard/analyze_once_test.dart

@@ -465,7 +465,7 @@ class _MyHomePageState extends State<MyHomePage> {
 const String pubspecYamlSrc = r'''
 name: flutter_project
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.1.0 <4.0.0"
 
 dependencies:
   flutter:

packages/flutter_tools/test/integration.shard/break_on_framework_exceptions_test.dart

@@ -731,7 +731,7 @@ class TestProject extends Project {
   final String pubspec = '''
     name: test
     environment:
-      sdk: '>=2.12.0-0 <3.0.0'
+      sdk: '>=2.12.0-0 <4.0.0'
 
     dependencies:
       flutter:

packages/flutter_tools/test/integration.shard/flutter_build_null_unsafe_test.dart

@@ -45,7 +45,7 @@ void main() {
     writeFile(fileSystem.path.join(projectRoot.path, 'pubspec.yaml'), '''
 name: hello
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 ''');
     writeFile(fileSystem.path.join(projectRoot.path, 'lib', 'main.dart'), '''
 import 'unsafe.dart';

packages/flutter_tools/test/integration.shard/test_data/background_project.dart

@@ -12,7 +12,7 @@ class BackgroundProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:
@@ -63,7 +63,7 @@ class RepeatingBackgroundProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/basic_project.dart

@@ -10,7 +10,7 @@ class BasicProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:
@@ -63,7 +63,7 @@ class BasicProjectThatThrows extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:
@@ -120,7 +120,7 @@ class BasicProjectWithTimelineTraces extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:
@@ -169,7 +169,7 @@ class BasicProjectWithFlutterGen extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:
@@ -181,8 +181,6 @@ class BasicProjectWithFlutterGen extends Project {
 
   @override
   final String main = r'''
-  // @dart = 2.8
-  // generated package does not support null safety.
   import 'dart:async';
   import 'package:flutter_gen/flutter_gen.dart';
 
@@ -196,7 +194,7 @@ class BasicProjectWithUnaryMain extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
   dependencies:
     flutter:
       sdk: flutter

packages/flutter_tools/test/integration.shard/test_data/compile_error_project.dart

@@ -10,7 +10,7 @@ class CompileErrorProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart

@@ -13,7 +13,7 @@ class DeferredComponentsProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/gen_l10n_project.dart

@@ -34,7 +34,7 @@ class GenL10nProject extends Project {
   final String pubspec = '''
 name: test_l10n_project
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0-0 <4.0.0"
 
 dependencies:
   flutter:

packages/flutter_tools/test/integration.shard/test_data/hot_reload_const_project.dart

@@ -10,7 +10,7 @@ class HotReloadConstProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart

@@ -12,7 +12,7 @@ class HotReloadProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/hot_reload_with_asset.dart

@@ -10,7 +10,7 @@ class HotReloadWithAssetProject extends Project {
   final String pubspec = '''
 name: test
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=2.12.0-0 <4.0.0'
 
 dependencies:
   flutter:

packages/flutter_tools/test/integration.shard/test_data/integration_tests_project.dart

@@ -14,7 +14,7 @@ class IntegrationTestsProject extends Project implements TestsProject {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/migrate_project.dart

@@ -176,7 +176,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.6.0 <3.0.0"
+  sdk: ">=2.6.0 <4.0.0"
 
 dependencies:
   flutter:

packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart

@@ -56,7 +56,7 @@ class MultidexProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/project_with_early_error.dart

@@ -10,7 +10,7 @@ class ProjectWithEarlyError extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/single_widget_reload_project.dart

@@ -10,7 +10,7 @@ class SingleWidgetReloadProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/stateless_stateful_project.dart

@@ -10,7 +10,7 @@ class HotReloadProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: ">=2.12.0-0 <3.0.0"
+    sdk: ">=2.12.0-0 <4.0.0"
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart

@@ -9,7 +9,7 @@ class SteppingProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
   dependencies:
     flutter:
       sdk: flutter
@@ -65,7 +65,7 @@ class WebSteppingProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.10.0 <3.0.0'
+    sdk: '>=2.10.0 <4.0.0'
   dependencies:
     flutter:
       sdk: flutter

packages/flutter_tools/test/integration.shard/test_data/test_project.dart

@@ -10,7 +10,7 @@ class TestProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/test_data/tests_project.dart

@@ -13,7 +13,7 @@ class TestsProject extends Project {
   final String pubspec = '''
   name: test
   environment:
-    sdk: '>=2.12.0-0 <3.0.0'
+    sdk: '>=2.12.0-0 <4.0.0'
 
   dependencies:
     flutter:

packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart

@@ -80,19 +80,17 @@ void main() {
     ),
   });
 
-  testUsingContext('generated plugin registrant passes analysis without null safety', () async {
+  testUsingContext('generated plugin registrant passes analysis with null safety', () async {
     await _createProject(projectDir, <String>[]);
     // We need a dependency so the plugin registrant is not completely empty.
     await _editPubspecFile(projectDir,
       _composeEditors(<PubspecEditor>[
         _addDependencyEditor('shared_preferences', version: '^2.0.0'),
 
-        // This turns null safety off
-        _setDartSDKVersionEditor('>=2.11.0 <3.0.0'),
+        _setDartSDKVersionEditor('>=2.12.0 <4.0.0'),
       ]));
 
-    // The generated main.dart file has a bunch of stuff that is invalid without null safety, so
-    // replace it with a no-op dummy main file. We aren't testing it in this scenario anyway.
+    // Replace main file with a no-op dummy. We aren't testing it in this scenario anyway.
     await _replaceMainFile(projectDir, 'void main() {}');
 
     // The plugin registrant is created on build...

packages/flutter_web_plugins/pubspec.yaml

@@ -3,7 +3,7 @@ description: Library to register Flutter Web plugins
 homepage: https://flutter.dev
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

packages/fuchsia_remote_debug_protocol/pubspec.yaml

@@ -4,7 +4,7 @@ description: Provides an API to test/debug Flutter applications on remote Fuchsi
 homepage: https://flutter.dev
 
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=2.12.0-0 <4.0.0'
 
 dependencies:
   process: 4.2.4

packages/integration_test/example/pubspec.yaml

@@ -3,7 +3,7 @@ description: Demonstrates how to use the integration_test plugin.
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=2.12.0-0 <4.0.0'
   flutter: ">=1.6.7"
 
 dependencies:

packages/integration_test/integration_test_macos/pubspec.yaml

@@ -10,7 +10,7 @@ flutter:
         pluginClass: IntegrationTestPlugin
 
 environment:
-  sdk: ">=2.17.0-0 <3.0.0"
+  sdk: ">=2.17.0-0 <4.0.0"
 
 dependencies:
   flutter:

packages/integration_test/pubspec.yaml

@@ -3,7 +3,7 @@ description: Runs tests that use the flutter_test API as integration tests.
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0-0 <3.0.0'
+  sdk: '>=2.12.0-0 <4.0.0'
 
 dependencies:
   flutter: