Skip to content

Commit 7c8e171

Browse files
a-sivaa-siva
authored
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
1 parent afdc484 commit 7c8e171

File tree

104 files changed

+132
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+132
-121
lines changed

‎bin/internal/engine.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
67254d6e4b0369fa83418cf9e9ff68b21c529765
1+
8d83b98c55b3d0839de0c4201f5a8d56dbf92d2f

‎dev/automated_tests/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_automated_tests
22

33
environment:
4-
sdk: ">=2.17.0-0 <3.0.0"
4+
sdk: ">=2.17.0-0 <4.0.0"
55

66
dependencies:
77
flutter:

‎dev/benchmarks/complex_layout/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: complex_layout
22
description: A benchmark of a relatively complex layout.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/benchmarks/macrobenchmarks/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: macrobenchmarks
22
description: Performance benchmarks using flutter drive.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/benchmarks/microbenchmarks/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: microbenchmarks
22
description: Small benchmarks for very specific parts of the Flutter framework.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
meta: 1.8.0

‎dev/benchmarks/multiple_flutters/module/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters benchmark test.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ">=2.17.0-0 <3.0.0"
7+
sdk: ">=2.17.0-0 <4.0.0"
88

99
dependencies:
1010
flutter:

‎dev/benchmarks/platform_channels_benchmarks/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
55
version: 1.0.0+1
66

77
environment:
8-
sdk: ">=2.17.0-0 <3.0.0"
8+
sdk: ">=2.17.0-0 <4.0.0"
99

1010
dependencies:
1111
flutter:

‎dev/benchmarks/platform_views_layout/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: platform_views_layout
22
description: A benchmark for platform views.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/benchmarks/platform_views_layout_hybrid_composition/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: platform_views_layout_hybrid_composition
22
description: A benchmark for platform views, using hybrid composition on android.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/benchmarks/test_apps/stocks/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: stocks
22

33
environment:
4-
sdk: ">=2.17.0-0 <3.0.0"
4+
sdk: ">=2.17.0-0 <4.0.0"
55

66
dependencies:
77
flutter:

‎dev/bots/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: tests_on_bots
22
description: Scripts which run on bots.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
args: 2.3.1

‎dev/conductor/core/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Flutter Automated Release Tool
44
publish_to: none
55

66
environment:
7-
sdk: ">=2.17.0-0 <3.0.0"
7+
sdk: ">=2.17.0-0 <4.0.0"
88

99
dependencies:
1010
archive: 3.3.2

‎dev/customer_testing/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: customer_testing
22
description: Tool to run the tests listed in the flutter/tests repository.
33

44
environment:
5-
sdk: '>=2.17.0-0 <3.0.0'
5+
sdk: '>=2.17.0-0 <4.0.0'
66

77
dependencies:
88
args: 2.3.1

‎dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Future<void> main() async {
1515
try {
1616
await runProjectTest((FlutterProject flutterProject) async {
1717
section('APK contains plugin classes');
18-
flutterProject.addPlugin('google_maps_flutter', value: '^1.0.10');
18+
await flutterProject.setMinSdkVersion(20);
19+
flutterProject.addPlugin('google_maps_flutter', value: '^2.2.1');
1920

2021
await inDirectory(flutterProject.rootPath, () async {
2122
await flutter('build', options: <String>[

‎dev/devicelab/bin/tasks/module_test_ios.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Future<void> main() async {
170170
'''
171171
dependencies:
172172
url_launcher: 6.0.20
173-
android_alarm_manager: 0.4.5+11
173+
android_alarm_manager: 2.0.2
174174
google_sign_in_ios: 5.5.0
175175
$dartPluginName:
176176
path: ../$dartPluginName

‎dev/devicelab/bin/tasks/plugin_dependencies_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ dependencies:
101101
sdk: flutter
102102
103103
environment:
104-
sdk: ">=2.0.0-dev.28.0 <3.0.0"
104+
sdk: ">=2.0.0-dev.28.0 <4.0.0"
105105
flutter: ">=1.5.0"
106106
''', flush: true);
107107

‎dev/devicelab/lib/framework/apk_utils.dart

+14
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,20 @@ android {
287287
pubspec.writeAsStringSync(content, flush: true);
288288
}
289289

290+
Future<void> setMinSdkVersion(int sdkVersion) async {
291+
final File buildScript = File(
292+
path.join(androidPath, 'app', 'build.gradle'),
293+
);
294+
295+
buildScript.openWrite(mode: FileMode.append).write('''
296+
android {
297+
defaultConfig {
298+
minSdkVersion $sdkVersion
299+
}
300+
}
301+
''');
302+
}
303+
290304
Future<void> getPackages() async {
291305
await inDirectory(Directory(rootPath), () async {
292306
await flutter('pub', options: <String>['get']);

‎dev/devicelab/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter continuous integration performance and correctness tests.
33
homepage: https://github.com/flutter/flutter
44

55
environment:
6-
sdk: ">=2.17.0-0 <3.0.0"
6+
sdk: ">=2.17.0-0 <4.0.0"
77

88
dependencies:
99
archive: 3.3.2

‎dev/docs/platform_integration/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: platform_integration
22

33
environment:
4-
sdk: ">=2.17.0-0 <3.0.0"
4+
sdk: ">=2.17.0-0 <4.0.0"

‎dev/forbidden_from_release_tests/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: forbidden_from_release_tests
22
publish_to: 'none'
33

44
environment:
5-
sdk: '>=2.17.0-0 <3.0.0'
5+
sdk: '>=2.17.0-0 <4.0.0'
66

77
dependencies:
88
args: 2.3.1

‎dev/integration_tests/abstract_method_smoke_test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: A new Flutter project.
44
version: 1.0.0+1
55

66
environment:
7-
sdk: ">=2.17.0-0 <3.0.0"
7+
sdk: ">=2.17.0-0 <4.0.0"
88

99
dependencies:
1010
flutter:

‎dev/integration_tests/android_embedding_v2_smoke_test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: A new Flutter project.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: ">=2.17.0-0 <3.0.0"
17+
sdk: ">=2.17.0-0 <4.0.0"
1818

1919
dependencies:
2020
flutter:

‎dev/integration_tests/android_semantics_testing/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: android_semantics_testing
22
description: Integration testing library for Android semantics
33
environment:
4-
sdk: '>=2.17.0-0 <3.0.0'
4+
sdk: '>=2.17.0-0 <4.0.0'
55

66
dependencies:
77
flutter:

‎dev/integration_tests/android_views/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: none
44
description: An integration test for embedded platform views
55
version: 1.0.0+1
66
environment:
7-
sdk: '>=2.17.0-0 <3.0.0'
7+
sdk: '>=2.17.0-0 <4.0.0'
88

99
dependencies:
1010
flutter:

‎dev/integration_tests/channels/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: channels
22
description: Integration test for platform channels.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/deferred_components_test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Integration test application for basic deferred components function
33
publish_to: 'none'
44
version: 1.0.0+1
55
environment:
6-
sdk: '>=2.17.0-0 <3.0.0'
6+
sdk: '>=2.17.0-0 <4.0.0'
77

88
dependencies:
99
flutter:

‎dev/integration_tests/external_ui/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: external_ui
22
description: A test of Flutter integrating external UIs.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/flavors/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: flavors
22
description: Integration test for build flavors.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/flutter_gallery/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_gallery
22

33
environment:
4-
sdk: ">=2.17.0-0 <3.0.0"
4+
sdk: ">=2.17.0-0 <4.0.0"
55

66
dependencies:
77
flutter:
@@ -20,7 +20,7 @@ dependencies:
2020
git:
2121
url: https://github.com/kevmoo/scoped_model.git
2222
ref: null_safety
23-
shrine_images: 1.1.2
23+
shrine_images: 2.0.1
2424

2525
# Also update dev/benchmarks/complex_layout/pubspec.yaml
2626
# and dev/benchmarks/macrobenchmarks/pubspec.yaml

‎dev/integration_tests/gradle_deprecated_settings/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: gradle_deprecated_settings
22
description: Integration test for the current settings.gradle.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/hybrid_android_views/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ publish_to: none
44
description: An integration test for hybrid composition on Android
55
version: 1.0.0+1
66
environment:
7-
sdk: '>=2.17.0-0 <3.0.0'
7+
sdk: '>=2.17.0-0 <4.0.0'
88

99
dependencies:
1010
flutter:

‎dev/integration_tests/ios_add2app_life_cycle/flutterapp/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: A new flutter module project.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: ">=2.17.0-0 <3.0.0"
17+
sdk: ">=2.17.0-0 <4.0.0"
1818

1919
dependencies:
2020
flutter:

‎dev/integration_tests/ios_app_with_extensions/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: ios_app_with_extensions
1313
version: 1.0.0+1
1414

1515
environment:
16-
sdk: ">=2.17.0-0 <3.0.0"
16+
sdk: ">=2.17.0-0 <4.0.0"
1717

1818
dependencies:
1919
flutter:

‎dev/integration_tests/ios_platform_view_tests/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: ios_platform_view_tests
33
version: 1.0.0+1
44

55
environment:
6-
sdk: ">=2.17.0-0 <3.0.0"
6+
sdk: ">=2.17.0-0 <4.0.0"
77

88
dependencies:
99
flutter:

‎dev/integration_tests/non_nullable/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
55
version: 1.0.0+1
66

77
environment:
8-
sdk: ">=2.17.0-0 <3.0.0"
8+
sdk: ">=2.17.0-0 <4.0.0"
99

1010
dependencies:
1111
flutter:

‎dev/integration_tests/platform_interaction/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: platform_interaction
22
description: Integration test for platform interactions.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/release_smoke_test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: release_smoke_test
22

33
environment:
4-
sdk: ">=2.17.0-0 <3.0.0"
4+
sdk: ">=2.17.0-0 <4.0.0"
55

66
dependencies:
77
flutter:

‎dev/integration_tests/spell_check/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1818
version: 1.0.0+1
1919

2020
environment:
21-
sdk: '>=2.18.0-149.0.dev <3.0.0'
21+
sdk: '>=2.18.0-149.0.dev <4.0.0'
2222

2323
# Dependencies specify other packages that your package needs in order to work.
2424
# To automatically upgrade your package dependencies to the latest versions

‎dev/integration_tests/ui/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: integration_ui
22
description: Flutter non-plugin UI integration tests.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

‎dev/integration_tests/web/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: web_integration
22
description: Integration test for web compilation.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
flutter:
88
assets:

‎dev/integration_tests/web_compile_tests/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: web_compile_tests
22
environment:
3-
sdk: '>=2.17.0-0 <3.0.0'
3+
sdk: '>=2.17.0-0 <4.0.0'
44

55
dependencies:
66
flutter:

‎dev/integration_tests/web_e2e_tests/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: web_e2e_tests
22
publish_to: none
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
flutter:
88
assets:

‎dev/integration_tests/windows_startup_test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: windows_startup_test
22
description: Integration test for Windows app's startup.
33

44
environment:
5-
sdk: ">=2.17.0-0 <3.0.0"
5+
sdk: ">=2.17.0-0 <4.0.0"
66

77
dependencies:
88
flutter:

0 commit comments

Comments
 (0)