firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Siva 2022-12-08 18:03:51 -08:00 committed by GitHub
parent afdc484011
commit 7c8e171320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
104 changed files with 132 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/internal/engine.version
View File

@ -1 +1 @@
67254d6e4b0369fa83418cf9e9ff68b21c529765
8d83b98c55b3d0839de0c4201f5a8d56dbf92d2f

2
dev/automated_tests/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/complex_layout/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/macrobenchmarks/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/microbenchmarks/pubspec.yaml
View File

@ -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

2
dev/benchmarks/multiple_flutters/module/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/platform_channels_benchmarks/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/platform_views_layout/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml
View File

@ -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:

2
dev/benchmarks/test_apps/stocks/pubspec.yaml
View File

@ -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:

2
dev/bots/pubspec.yaml
View File

@ -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

2
dev/conductor/core/pubspec.yaml
View File

@ -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

2
dev/customer_testing/pubspec.yaml
View File

@ -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

3
dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart
View File

@ -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>[

2
dev/devicelab/bin/tasks/module_test_ios.dart
View File

@ -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

2
dev/devicelab/bin/tasks/plugin_dependencies_test.dart
View File

@ -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);

14
dev/devicelab/lib/framework/apk_utils.dart
View File

@ -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']);

2
dev/devicelab/pubspec.yaml
View File

@ -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

2
dev/docs/platform_integration/pubspec.yaml
View File

@ -1,4 +1,4 @@
name: platform_integration
environment:
sdk: ">=2.17.0-0 <3.0.0"
sdk: ">=2.17.0-0 <4.0.0"

2
dev/forbidden_from_release_tests/pubspec.yaml
View File

@ -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

2
dev/integration_tests/abstract_method_smoke_test/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/android_semantics_testing/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/android_views/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/channels/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/deferred_components_test/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/external_ui/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/flavors/pubspec.yaml
View File

@ -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:

4
dev/integration_tests/flutter_gallery/pubspec.yaml
View File

@ -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

2
dev/integration_tests/gradle_deprecated_settings/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/hybrid_android_views/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/ios_app_with_extensions/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/ios_platform_view_tests/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/non_nullable/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/platform_interaction/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/release_smoke_test/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/spell_check/pubspec.yaml
View File

@ -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

2
dev/integration_tests/ui/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/web/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/web_compile_tests/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/web_e2e_tests/pubspec.yaml
View File

@ -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:

2
dev/integration_tests/windows_startup_test/pubspec.yaml
View File

@ -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:

2
dev/manual_tests/pubspec.yaml
View File

@ -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:

2
dev/missing_dependency_tests/pubspec.yaml
View File

@ -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:

2
dev/tools/dartdoc.dart
View File

@ -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:');

2
dev/tools/gen_defaults/pubspec.yaml
View File

@ -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:

2
dev/tools/gen_keycodes/pubspec.yaml
View File

@ -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

2
dev/tools/pubspec.yaml
View File

@ -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

2
dev/tools/vitool/pubspec.yaml
View File

@ -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:

2
dev/tracing_tests/pubspec.yaml
View File

@ -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:

2
examples/api/pubspec.yaml
View File

@ -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:

2
examples/flutter_view/pubspec.yaml
View File

@ -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:

2
examples/hello_world/pubspec.yaml
View File

@ -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:

2
examples/image_list/pubspec.yaml
View File

@ -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:

2
examples/layers/pubspec.yaml
View File

@ -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:

2
examples/platform_channel/pubspec.yaml
View File

@ -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:

2
examples/platform_channel_swift/pubspec.yaml
View File

@ -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:

2
examples/platform_view/pubspec.yaml
View File

@ -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:

2
examples/splash/pubspec.yaml
View File

@ -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:

2
packages/flutter/pubspec.yaml
View File

@ -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".

2
packages/flutter/test_private/pubspec.yaml
View File

@ -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".

2
packages/flutter/test_private/test/pubspec.yaml
View File

@ -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".

2
packages/flutter_driver/pubspec.yaml
View File

@ -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

2
packages/flutter_goldens/pubspec.yaml
View File

@ -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".

2
packages/flutter_goldens_client/pubspec.yaml
View File

@ -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".

2
packages/flutter_localizations/pubspec.yaml
View File

@ -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".

2
packages/flutter_test/pubspec.yaml
View File

@ -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".

2
packages/flutter_test/test/test_config/project_root/pubspec.yaml
View File

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

6
packages/flutter_tools/lib/src/commands/update_packages.dart
View File

@ -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;

2
packages/flutter_tools/pubspec.yaml
View File

@ -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".

2
packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart
View File

@ -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'));

4
packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart
View File

@ -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:

2
packages/flutter_tools/test/data/asset_test/font/pubspec.yaml
View File

@ -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

2
packages/flutter_tools/test/data/asset_test/main/pubspec.yaml
View File

@ -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:

2
packages/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart
View File

@ -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"
''';

2
packages/flutter_tools/test/general.shard/test/test_compiler_test.dart
View File

@ -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"
''');

6
packages/flutter_tools/test/general.shard/update_packages_test.dart
View File

@ -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".

2
packages/flutter_tools/test/integration.shard/analyze_once_test.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/break_on_framework_exceptions_test.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/flutter_build_null_unsafe_test.dart
View File

@ -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';

4
packages/flutter_tools/test/integration.shard/test_data/background_project.dart
View File

@ -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:

12
packages/flutter_tools/test/integration.shard/test_data/basic_project.dart
View File

@ -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

2
packages/flutter_tools/test/integration.shard/test_data/compile_error_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/gen_l10n_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/hot_reload_const_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/hot_reload_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/hot_reload_with_asset.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/integration_tests_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/migrate_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/project_with_early_error.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/single_widget_reload_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/stateless_stateful_project.dart
View File

@ -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:

4
packages/flutter_tools/test/integration.shard/test_data/stepping_project.dart
View File

@ -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

2
packages/flutter_tools/test/integration.shard/test_data/test_project.dart
View File

@ -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:

2
packages/flutter_tools/test/integration.shard/test_data/tests_project.dart
View File

@ -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:

8
packages/flutter_tools/test/integration.shard/web_plugin_registrant_test.dart
View File

@ -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...

2
packages/flutter_web_plugins/pubspec.yaml
View File

@ -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:

Some files were not shown because too many files have changed in this diff Show More