From 7c8e171320505c72444ff49a019f9d79c5cf170c Mon Sep 17 00:00:00 2001 From: Siva Date: Thu, 8 Dec 2022 18:03:51 -0800 Subject: [PATCH] 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 | 2 +- dev/automated_tests/pubspec.yaml | 2 +- dev/benchmarks/complex_layout/pubspec.yaml | 2 +- dev/benchmarks/macrobenchmarks/pubspec.yaml | 2 +- dev/benchmarks/microbenchmarks/pubspec.yaml | 2 +- .../multiple_flutters/module/pubspec.yaml | 2 +- .../platform_channels_benchmarks/pubspec.yaml | 2 +- dev/benchmarks/platform_views_layout/pubspec.yaml | 2 +- .../pubspec.yaml | 2 +- dev/benchmarks/test_apps/stocks/pubspec.yaml | 2 +- dev/bots/pubspec.yaml | 2 +- dev/conductor/core/pubspec.yaml | 2 +- dev/customer_testing/pubspec.yaml | 2 +- .../bin/tasks/gradle_desugar_classes_test.dart | 3 ++- dev/devicelab/bin/tasks/module_test_ios.dart | 2 +- .../bin/tasks/plugin_dependencies_test.dart | 2 +- dev/devicelab/lib/framework/apk_utils.dart | 14 ++++++++++++++ dev/devicelab/pubspec.yaml | 2 +- dev/docs/platform_integration/pubspec.yaml | 2 +- dev/forbidden_from_release_tests/pubspec.yaml | 2 +- .../abstract_method_smoke_test/pubspec.yaml | 2 +- .../android_embedding_v2_smoke_test/pubspec.yaml | 2 +- .../android_semantics_testing/pubspec.yaml | 2 +- dev/integration_tests/android_views/pubspec.yaml | 2 +- dev/integration_tests/channels/pubspec.yaml | 2 +- .../deferred_components_test/pubspec.yaml | 2 +- dev/integration_tests/external_ui/pubspec.yaml | 2 +- dev/integration_tests/flavors/pubspec.yaml | 2 +- dev/integration_tests/flutter_gallery/pubspec.yaml | 4 ++-- .../gradle_deprecated_settings/pubspec.yaml | 2 +- .../hybrid_android_views/pubspec.yaml | 2 +- .../ios_add2app_life_cycle/flutterapp/pubspec.yaml | 2 +- .../ios_app_with_extensions/pubspec.yaml | 2 +- .../ios_platform_view_tests/pubspec.yaml | 2 +- dev/integration_tests/non_nullable/pubspec.yaml | 2 +- .../platform_interaction/pubspec.yaml | 2 +- .../release_smoke_test/pubspec.yaml | 2 +- dev/integration_tests/spell_check/pubspec.yaml | 2 +- dev/integration_tests/ui/pubspec.yaml | 2 +- dev/integration_tests/web/pubspec.yaml | 2 +- .../web_compile_tests/pubspec.yaml | 2 +- dev/integration_tests/web_e2e_tests/pubspec.yaml | 2 +- .../windows_startup_test/pubspec.yaml | 2 +- dev/manual_tests/pubspec.yaml | 2 +- dev/missing_dependency_tests/pubspec.yaml | 2 +- dev/tools/dartdoc.dart | 2 +- dev/tools/gen_defaults/pubspec.yaml | 2 +- dev/tools/gen_keycodes/pubspec.yaml | 2 +- dev/tools/pubspec.yaml | 2 +- dev/tools/vitool/pubspec.yaml | 2 +- dev/tracing_tests/pubspec.yaml | 2 +- examples/api/pubspec.yaml | 2 +- examples/flutter_view/pubspec.yaml | 2 +- examples/hello_world/pubspec.yaml | 2 +- examples/image_list/pubspec.yaml | 2 +- examples/layers/pubspec.yaml | 2 +- examples/platform_channel/pubspec.yaml | 2 +- examples/platform_channel_swift/pubspec.yaml | 2 +- examples/platform_view/pubspec.yaml | 2 +- examples/splash/pubspec.yaml | 2 +- packages/flutter/pubspec.yaml | 2 +- packages/flutter/test_private/pubspec.yaml | 2 +- packages/flutter/test_private/test/pubspec.yaml | 2 +- packages/flutter_driver/pubspec.yaml | 2 +- packages/flutter_goldens/pubspec.yaml | 2 +- packages/flutter_goldens_client/pubspec.yaml | 2 +- packages/flutter_localizations/pubspec.yaml | 2 +- packages/flutter_test/pubspec.yaml | 2 +- .../test/test_config/project_root/pubspec.yaml | 2 +- .../lib/src/commands/update_packages.dart | 6 +++--- packages/flutter_tools/pubspec.yaml | 2 +- .../hermetic/analyze_continuously_test.dart | 2 +- .../hermetic/update_packages_test.dart | 4 ++-- .../test/data/asset_test/font/pubspec.yaml | 2 +- .../test/data/asset_test/main/pubspec.yaml | 2 +- .../targets/dart_plugin_registrant_test.dart | 2 +- .../general.shard/test/test_compiler_test.dart | 2 +- .../test/general.shard/update_packages_test.dart | 6 +++--- .../test/integration.shard/analyze_once_test.dart | 2 +- .../break_on_framework_exceptions_test.dart | 2 +- .../flutter_build_null_unsafe_test.dart | 2 +- .../test_data/background_project.dart | 4 ++-- .../integration.shard/test_data/basic_project.dart | 12 +++++------- .../test_data/compile_error_project.dart | 2 +- .../test_data/deferred_components_project.dart | 2 +- .../test_data/gen_l10n_project.dart | 2 +- .../test_data/hot_reload_const_project.dart | 2 +- .../test_data/hot_reload_project.dart | 2 +- .../test_data/hot_reload_with_asset.dart | 2 +- .../test_data/integration_tests_project.dart | 2 +- .../test_data/migrate_project.dart | 2 +- .../test_data/multidex_project.dart | 2 +- .../test_data/project_with_early_error.dart | 2 +- .../test_data/single_widget_reload_project.dart | 2 +- .../test_data/stateless_stateful_project.dart | 2 +- .../test_data/stepping_project.dart | 4 ++-- .../integration.shard/test_data/test_project.dart | 2 +- .../integration.shard/test_data/tests_project.dart | 2 +- .../web_plugin_registrant_test.dart | 8 +++----- packages/flutter_web_plugins/pubspec.yaml | 2 +- .../fuchsia_remote_debug_protocol/pubspec.yaml | 2 +- packages/integration_test/example/pubspec.yaml | 2 +- .../integration_test_macos/pubspec.yaml | 2 +- packages/integration_test/pubspec.yaml | 2 +- 104 files changed, 132 insertions(+), 121 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 9471c512cc..072bbac42d 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -67254d6e4b0369fa83418cf9e9ff68b21c529765 +8d83b98c55b3d0839de0c4201f5a8d56dbf92d2f diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index fc9014775a..5ddc94cd7f 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_automated_tests environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 2525ce9d1f..2b87c0adc9 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/macrobenchmarks/pubspec.yaml b/dev/benchmarks/macrobenchmarks/pubspec.yaml index b1e58fa563..d8f6b98871 100644 --- a/dev/benchmarks/macrobenchmarks/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/microbenchmarks/pubspec.yaml b/dev/benchmarks/microbenchmarks/pubspec.yaml index 93fb799543..8cac43e6f3 100644 --- a/dev/benchmarks/microbenchmarks/pubspec.yaml +++ b/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 diff --git a/dev/benchmarks/multiple_flutters/module/pubspec.yaml b/dev/benchmarks/multiple_flutters/module/pubspec.yaml index 12d128d2a6..f601fd8abc 100644 --- a/dev/benchmarks/multiple_flutters/module/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/platform_channels_benchmarks/pubspec.yaml b/dev/benchmarks/platform_channels_benchmarks/pubspec.yaml index 908500cf2b..7a65a39e6c 100644 --- a/dev/benchmarks/platform_channels_benchmarks/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/platform_views_layout/pubspec.yaml b/dev/benchmarks/platform_views_layout/pubspec.yaml index 40b3cf9ce9..ecbe18af8f 100644 --- a/dev/benchmarks/platform_views_layout/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml b/dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml index 1f0097bb0f..563229913a 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml +++ b/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: diff --git a/dev/benchmarks/test_apps/stocks/pubspec.yaml b/dev/benchmarks/test_apps/stocks/pubspec.yaml index ed85f8bae3..e62b8ff9a9 100644 --- a/dev/benchmarks/test_apps/stocks/pubspec.yaml +++ b/dev/benchmarks/test_apps/stocks/pubspec.yaml @@ -1,7 +1,7 @@ name: stocks environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index 48a361df46..9747eff910 100644 --- a/dev/bots/pubspec.yaml +++ b/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 diff --git a/dev/conductor/core/pubspec.yaml b/dev/conductor/core/pubspec.yaml index aca9675a11..d06e422805 100644 --- a/dev/conductor/core/pubspec.yaml +++ b/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 diff --git a/dev/customer_testing/pubspec.yaml b/dev/customer_testing/pubspec.yaml index 761d57f864..fa0c77905e 100644 --- a/dev/customer_testing/pubspec.yaml +++ b/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 diff --git a/dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart b/dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart index 4fe64d52d0..ec6cec85ad 100644 --- a/dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart +++ b/dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart @@ -15,7 +15,8 @@ Future 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: [ diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart index f2322c3c0a..86d47afe35 100644 --- a/dev/devicelab/bin/tasks/module_test_ios.dart +++ b/dev/devicelab/bin/tasks/module_test_ios.dart @@ -170,7 +170,7 @@ Future 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 diff --git a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart index 26d8dada3a..fa2bd9e90d 100644 --- a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart +++ b/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); diff --git a/dev/devicelab/lib/framework/apk_utils.dart b/dev/devicelab/lib/framework/apk_utils.dart index e9a989cefd..e79bd6b5e1 100644 --- a/dev/devicelab/lib/framework/apk_utils.dart +++ b/dev/devicelab/lib/framework/apk_utils.dart @@ -287,6 +287,20 @@ android { pubspec.writeAsStringSync(content, flush: true); } + Future 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 getPackages() async { await inDirectory(Directory(rootPath), () async { await flutter('pub', options: ['get']); diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml index c988e9a6a7..a6dc98aaeb 100644 --- a/dev/devicelab/pubspec.yaml +++ b/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 diff --git a/dev/docs/platform_integration/pubspec.yaml b/dev/docs/platform_integration/pubspec.yaml index e56e23d2b0..bb60d621c4 100644 --- a/dev/docs/platform_integration/pubspec.yaml +++ b/dev/docs/platform_integration/pubspec.yaml @@ -1,4 +1,4 @@ name: platform_integration environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" diff --git a/dev/forbidden_from_release_tests/pubspec.yaml b/dev/forbidden_from_release_tests/pubspec.yaml index f1ca8df588..cdee1c9ba6 100644 --- a/dev/forbidden_from_release_tests/pubspec.yaml +++ b/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 diff --git a/dev/integration_tests/abstract_method_smoke_test/pubspec.yaml b/dev/integration_tests/abstract_method_smoke_test/pubspec.yaml index 574e7d7087..ad67cfa39c 100644 --- a/dev/integration_tests/abstract_method_smoke_test/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml b/dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml index a9ed6c6f18..bf241be79f 100644 --- a/dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/android_semantics_testing/pubspec.yaml b/dev/integration_tests/android_semantics_testing/pubspec.yaml index e09fa1c419..bacd717bab 100644 --- a/dev/integration_tests/android_semantics_testing/pubspec.yaml +++ b/dev/integration_tests/android_semantics_testing/pubspec.yaml @@ -1,7 +1,7 @@ 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: diff --git a/dev/integration_tests/android_views/pubspec.yaml b/dev/integration_tests/android_views/pubspec.yaml index 6d38686f89..d02be80efb 100644 --- a/dev/integration_tests/android_views/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index fd430d273c..a4f5fbbcd5 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/deferred_components_test/pubspec.yaml b/dev/integration_tests/deferred_components_test/pubspec.yaml index 06dc851c3d..55e62304ae 100644 --- a/dev/integration_tests/deferred_components_test/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/external_ui/pubspec.yaml b/dev/integration_tests/external_ui/pubspec.yaml index ca9407b7f4..36f3db98a8 100644 --- a/dev/integration_tests/external_ui/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index a87e62550f..94293f889a 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/flutter_gallery/pubspec.yaml b/dev/integration_tests/flutter_gallery/pubspec.yaml index 9440b69a84..cfc5f5a7df 100644 --- a/dev/integration_tests/flutter_gallery/pubspec.yaml +++ b/dev/integration_tests/flutter_gallery/pubspec.yaml @@ -1,7 +1,7 @@ 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 diff --git a/dev/integration_tests/gradle_deprecated_settings/pubspec.yaml b/dev/integration_tests/gradle_deprecated_settings/pubspec.yaml index cd92473dc0..527084dd43 100644 --- a/dev/integration_tests/gradle_deprecated_settings/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/hybrid_android_views/pubspec.yaml b/dev/integration_tests/hybrid_android_views/pubspec.yaml index 5fe5c7dd32..1f7dab5296 100644 --- a/dev/integration_tests/hybrid_android_views/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml b/dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml index 6ac8a9405c..82dd676480 100644 --- a/dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/ios_app_with_extensions/pubspec.yaml b/dev/integration_tests/ios_app_with_extensions/pubspec.yaml index 1f8d016396..b9912f64ea 100644 --- a/dev/integration_tests/ios_app_with_extensions/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/ios_platform_view_tests/pubspec.yaml b/dev/integration_tests/ios_platform_view_tests/pubspec.yaml index f535c7ee5c..1e2af46737 100644 --- a/dev/integration_tests/ios_platform_view_tests/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/non_nullable/pubspec.yaml b/dev/integration_tests/non_nullable/pubspec.yaml index 595ce00d5c..daea3229ac 100644 --- a/dev/integration_tests/non_nullable/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/platform_interaction/pubspec.yaml b/dev/integration_tests/platform_interaction/pubspec.yaml index f700ef0a9d..b6ce71adad 100644 --- a/dev/integration_tests/platform_interaction/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/release_smoke_test/pubspec.yaml b/dev/integration_tests/release_smoke_test/pubspec.yaml index efb3269e72..37b2a4feb5 100644 --- a/dev/integration_tests/release_smoke_test/pubspec.yaml +++ b/dev/integration_tests/release_smoke_test/pubspec.yaml @@ -1,7 +1,7 @@ name: release_smoke_test environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/dev/integration_tests/spell_check/pubspec.yaml b/dev/integration_tests/spell_check/pubspec.yaml index 228c9fee62..816bbcdf08 100644 --- a/dev/integration_tests/spell_check/pubspec.yaml +++ b/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 diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 4a0cc9b104..94d7a13eec 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/web/pubspec.yaml b/dev/integration_tests/web/pubspec.yaml index 891688a221..17171c06c4 100644 --- a/dev/integration_tests/web/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/web_compile_tests/pubspec.yaml b/dev/integration_tests/web_compile_tests/pubspec.yaml index e3af760f7a..764ef90b33 100644 --- a/dev/integration_tests/web_compile_tests/pubspec.yaml +++ b/dev/integration_tests/web_compile_tests/pubspec.yaml @@ -1,6 +1,6 @@ name: web_compile_tests environment: - sdk: '>=2.17.0-0 <3.0.0' + sdk: '>=2.17.0-0 <4.0.0' dependencies: flutter: diff --git a/dev/integration_tests/web_e2e_tests/pubspec.yaml b/dev/integration_tests/web_e2e_tests/pubspec.yaml index d68faff9bf..16c32a05f5 100644 --- a/dev/integration_tests/web_e2e_tests/pubspec.yaml +++ b/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: diff --git a/dev/integration_tests/windows_startup_test/pubspec.yaml b/dev/integration_tests/windows_startup_test/pubspec.yaml index 9615ec6be0..c364506ec7 100644 --- a/dev/integration_tests/windows_startup_test/pubspec.yaml +++ b/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: diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index 403c342c5a..fd31fe3bf7 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -1,7 +1,7 @@ name: manual_tests environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/dev/missing_dependency_tests/pubspec.yaml b/dev/missing_dependency_tests/pubspec.yaml index bd8d667b1e..ebed8816e9 100644 --- a/dev/missing_dependency_tests/pubspec.yaml +++ b/dev/missing_dependency_tests/pubspec.yaml @@ -1,7 +1,7 @@ name: missing_dependency_tests environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index 7c9ffaf009..f577cadd94 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -59,7 +59,7 @@ Future main(List 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:'); diff --git a/dev/tools/gen_defaults/pubspec.yaml b/dev/tools/gen_defaults/pubspec.yaml index 2f42ef652a..ed298d766c 100644 --- a/dev/tools/gen_defaults/pubspec.yaml +++ b/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: diff --git a/dev/tools/gen_keycodes/pubspec.yaml b/dev/tools/gen_keycodes/pubspec.yaml index 985e4195d1..08c9804568 100644 --- a/dev/tools/gen_keycodes/pubspec.yaml +++ b/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 diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 07931974c7..7fb6252daa 100644 --- a/dev/tools/pubspec.yaml +++ b/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 diff --git a/dev/tools/vitool/pubspec.yaml b/dev/tools/vitool/pubspec.yaml index 2cb22f6082..d2e8ee37fc 100644 --- a/dev/tools/vitool/pubspec.yaml +++ b/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: diff --git a/dev/tracing_tests/pubspec.yaml b/dev/tracing_tests/pubspec.yaml index ba218b47ea..e8937ed969 100644 --- a/dev/tracing_tests/pubspec.yaml +++ b/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: diff --git a/examples/api/pubspec.yaml b/examples/api/pubspec.yaml index 9646c0c927..40695ebde9 100644 --- a/examples/api/pubspec.yaml +++ b/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: diff --git a/examples/flutter_view/pubspec.yaml b/examples/flutter_view/pubspec.yaml index 4be70dd1bd..03b0f21e42 100644 --- a/examples/flutter_view/pubspec.yaml +++ b/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: diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index 9b92c2858a..1fd49c7803 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -1,7 +1,7 @@ name: hello_world environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/examples/image_list/pubspec.yaml b/examples/image_list/pubspec.yaml index a918140076..12a7b7ddf5 100644 --- a/examples/image_list/pubspec.yaml +++ b/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: diff --git a/examples/layers/pubspec.yaml b/examples/layers/pubspec.yaml index b56c8e7973..7a32fc09fa 100644 --- a/examples/layers/pubspec.yaml +++ b/examples/layers/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_examples_layers environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/examples/platform_channel/pubspec.yaml b/examples/platform_channel/pubspec.yaml index 13036da9fd..166c45ad02 100644 --- a/examples/platform_channel/pubspec.yaml +++ b/examples/platform_channel/pubspec.yaml @@ -1,7 +1,7 @@ name: platform_channel environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/examples/platform_channel_swift/pubspec.yaml b/examples/platform_channel_swift/pubspec.yaml index e2f38d0c0d..c6b168a170 100644 --- a/examples/platform_channel_swift/pubspec.yaml +++ b/examples/platform_channel_swift/pubspec.yaml @@ -1,7 +1,7 @@ name: platform_channel_swift environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/examples/platform_view/pubspec.yaml b/examples/platform_view/pubspec.yaml index 025e731621..62aad0c107 100644 --- a/examples/platform_view/pubspec.yaml +++ b/examples/platform_view/pubspec.yaml @@ -1,7 +1,7 @@ name: platform_view environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/examples/splash/pubspec.yaml b/examples/splash/pubspec.yaml index 7e1bc369c8..8a5ccb9ecf 100644 --- a/examples/splash/pubspec.yaml +++ b/examples/splash/pubspec.yaml @@ -1,7 +1,7 @@ name: splash environment: - sdk: ">=2.17.0-0 <3.0.0" + sdk: ">=2.17.0-0 <4.0.0" dependencies: flutter: diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index ede82b6dac..559f90ebc0 100644 --- a/packages/flutter/pubspec.yaml +++ b/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". diff --git a/packages/flutter/test_private/pubspec.yaml b/packages/flutter/test_private/pubspec.yaml index 30fabe9a80..ebfc1efaff 100644 --- a/packages/flutter/test_private/pubspec.yaml +++ b/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". diff --git a/packages/flutter/test_private/test/pubspec.yaml b/packages/flutter/test_private/test/pubspec.yaml index 37e60ba555..0a62c7c130 100644 --- a/packages/flutter/test_private/test/pubspec.yaml +++ b/packages/flutter/test_private/test/pubspec.yaml @@ -1,7 +1,7 @@ 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". diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index dff59deeb7..7b7295a8be 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/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 diff --git a/packages/flutter_goldens/pubspec.yaml b/packages/flutter_goldens/pubspec.yaml index d69dcd5fd5..26b5489159 100644 --- a/packages/flutter_goldens/pubspec.yaml +++ b/packages/flutter_goldens/pubspec.yaml @@ -1,7 +1,7 @@ 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". diff --git a/packages/flutter_goldens_client/pubspec.yaml b/packages/flutter_goldens_client/pubspec.yaml index d9efaed2c5..9cfec36f06 100644 --- a/packages/flutter_goldens_client/pubspec.yaml +++ b/packages/flutter_goldens_client/pubspec.yaml @@ -1,7 +1,7 @@ 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". diff --git a/packages/flutter_localizations/pubspec.yaml b/packages/flutter_localizations/pubspec.yaml index 3cfda8d2a9..79da1e0d36 100644 --- a/packages/flutter_localizations/pubspec.yaml +++ b/packages/flutter_localizations/pubspec.yaml @@ -1,7 +1,7 @@ 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". diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index fe6b7dcfb8..71b0e31f37 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -1,7 +1,7 @@ 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". diff --git a/packages/flutter_test/test/test_config/project_root/pubspec.yaml b/packages/flutter_test/test/test_config/project_root/pubspec.yaml index 8a39bec6b8..30c83394c6 100644 --- a/packages/flutter_test/test/test_config/project_root/pubspec.yaml +++ b/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 diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index ffaf226457..aa83b5a856 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/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; diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 91dafbe172..acacff48c6 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/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". diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart index 3039279c1f..fabc5afe60 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart +++ b/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')); diff --git a/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart index 2f205b53e9..ced2dd0c45 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart +++ b/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: diff --git a/packages/flutter_tools/test/data/asset_test/font/pubspec.yaml b/packages/flutter_tools/test/data/asset_test/font/pubspec.yaml index 10e62a8564..654dc75902 100644 --- a/packages/flutter_tools/test/data/asset_test/font/pubspec.yaml +++ b/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 diff --git a/packages/flutter_tools/test/data/asset_test/main/pubspec.yaml b/packages/flutter_tools/test/data/asset_test/main/pubspec.yaml index 5a898f9ec0..2e1e9152ca 100644 --- a/packages/flutter_tools/test/data/asset_test/main/pubspec.yaml +++ b/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: diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart index 9bce797827..67d79aa998 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart +++ b/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" '''; diff --git a/packages/flutter_tools/test/general.shard/test/test_compiler_test.dart b/packages/flutter_tools/test/general.shard/test/test_compiler_test.dart index bd2bb06d07..9d2da36686 100644 --- a/packages/flutter_tools/test/general.shard/test/test_compiler_test.dart +++ b/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" '''); diff --git a/packages/flutter_tools/test/general.shard/update_packages_test.dart b/packages/flutter_tools/test/general.shard/update_packages_test.dart index 32f7445543..9a57293a9b 100644 --- a/packages/flutter_tools/test/general.shard/update_packages_test.dart +++ b/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". diff --git a/packages/flutter_tools/test/integration.shard/analyze_once_test.dart b/packages/flutter_tools/test/integration.shard/analyze_once_test.dart index 5b3b3488a9..72f13e6890 100644 --- a/packages/flutter_tools/test/integration.shard/analyze_once_test.dart +++ b/packages/flutter_tools/test/integration.shard/analyze_once_test.dart @@ -465,7 +465,7 @@ class _MyHomePageState extends State { const String pubspecYamlSrc = r''' name: flutter_project environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.1.0 <4.0.0" dependencies: flutter: diff --git a/packages/flutter_tools/test/integration.shard/break_on_framework_exceptions_test.dart b/packages/flutter_tools/test/integration.shard/break_on_framework_exceptions_test.dart index 960361dec9..57762ba6a6 100644 --- a/packages/flutter_tools/test/integration.shard/break_on_framework_exceptions_test.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/flutter_build_null_unsafe_test.dart b/packages/flutter_tools/test/integration.shard/flutter_build_null_unsafe_test.dart index 10326feed5..b4f6705c5c 100644 --- a/packages/flutter_tools/test/integration.shard/flutter_build_null_unsafe_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/integration.shard/test_data/background_project.dart b/packages/flutter_tools/test/integration.shard/test_data/background_project.dart index 270f3a4541..0fccff366c 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/background_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/basic_project.dart b/packages/flutter_tools/test/integration.shard/test_data/basic_project.dart index 12a77fed9c..3f3c031cdd 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/basic_project.dart +++ b/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 diff --git a/packages/flutter_tools/test/integration.shard/test_data/compile_error_project.dart b/packages/flutter_tools/test/integration.shard/test_data/compile_error_project.dart index 2732b38ba9..1ba2f5b628 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/compile_error_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart b/packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart index b5ea7c6ea3..b135962465 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/gen_l10n_project.dart b/packages/flutter_tools/test/integration.shard/test_data/gen_l10n_project.dart index 0723fe5b72..13639aa3ef 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/gen_l10n_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_const_project.dart b/packages/flutter_tools/test/integration.shard/test_data/hot_reload_const_project.dart index 0a2a1456ac..d6d9c086a8 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_const_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart b/packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart index 4ddb5be40a..c61082b8a1 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_with_asset.dart b/packages/flutter_tools/test/integration.shard/test_data/hot_reload_with_asset.dart index 6cd7dc7dca..ae26ac4e68 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/hot_reload_with_asset.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/integration_tests_project.dart b/packages/flutter_tools/test/integration.shard/test_data/integration_tests_project.dart index 8d24a8523c..1a5c0ad67a 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/integration_tests_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/migrate_project.dart b/packages/flutter_tools/test/integration.shard/test_data/migrate_project.dart index e14d8b1597..7b1b187252 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/migrate_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart b/packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart index 2b0fc25b28..26964c4f44 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/project_with_early_error.dart b/packages/flutter_tools/test/integration.shard/test_data/project_with_early_error.dart index 7578d6559c..9c90f4981a 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/project_with_early_error.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/single_widget_reload_project.dart b/packages/flutter_tools/test/integration.shard/test_data/single_widget_reload_project.dart index 083a0c04d3..690c71a2af 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/single_widget_reload_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/stateless_stateful_project.dart b/packages/flutter_tools/test/integration.shard/test_data/stateless_stateful_project.dart index 5d89cb914e..e1c312ce94 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/stateless_stateful_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart b/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart index d3a2bec2ca..ce51fe469f 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart +++ b/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 diff --git a/packages/flutter_tools/test/integration.shard/test_data/test_project.dart b/packages/flutter_tools/test/integration.shard/test_data/test_project.dart index 02b3c1a9a6..77b62a4498 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/test_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/test_data/tests_project.dart b/packages/flutter_tools/test/integration.shard/test_data/tests_project.dart index 80984677ee..308e16a38f 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/tests_project.dart +++ b/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: diff --git a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart b/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart index 3702715601..9477b7d8ac 100644 --- a/packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart +++ b/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, []); // We need a dependency so the plugin registrant is not completely empty. await _editPubspecFile(projectDir, _composeEditors([ _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... diff --git a/packages/flutter_web_plugins/pubspec.yaml b/packages/flutter_web_plugins/pubspec.yaml index ab20c5183c..d6e576b907 100644 --- a/packages/flutter_web_plugins/pubspec.yaml +++ b/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: diff --git a/packages/fuchsia_remote_debug_protocol/pubspec.yaml b/packages/fuchsia_remote_debug_protocol/pubspec.yaml index f99f50e4af..1eb33b077a 100644 --- a/packages/fuchsia_remote_debug_protocol/pubspec.yaml +++ b/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 diff --git a/packages/integration_test/example/pubspec.yaml b/packages/integration_test/example/pubspec.yaml index 44957a65ec..a4781a35c6 100644 --- a/packages/integration_test/example/pubspec.yaml +++ b/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: diff --git a/packages/integration_test/integration_test_macos/pubspec.yaml b/packages/integration_test/integration_test_macos/pubspec.yaml index 1860af7706..ae3911318e 100644 --- a/packages/integration_test/integration_test_macos/pubspec.yaml +++ b/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: diff --git a/packages/integration_test/pubspec.yaml b/packages/integration_test/pubspec.yaml index f2215ab4de..245862d4ea 100644 --- a/packages/integration_test/pubspec.yaml +++ b/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: