From 32b3e66d7cdb35a9ca03ec47ecaa492ae684438d Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Wed, 15 Mar 2023 11:53:00 -0700 Subject: [PATCH] Revert "Bump lower Dart SDK constraints to 3.0 (#40178)" (flutter/engine#40317) Revert "Bump lower Dart SDK constraints to 3.0" --- engine/src/flutter/ci/bin/format.dart | 81 ++++++++++++------- engine/src/flutter/ci/pubspec.yaml | 2 +- .../flutter_frontend_server/pubspec.yaml | 2 +- .../impeller/tessellator/dart/pubspec.yaml | 2 +- engine/src/flutter/lib/snapshot/pubspec.yaml | 2 +- engine/src/flutter/lib/web_ui/pubspec.yaml | 2 +- .../fuchsia/dart-pkg/fuchsia/pubspec.yaml | 2 +- .../fuchsia/dart-pkg/zircon/pubspec.yaml | 2 +- .../fuchsia/dart-pkg/zircon_ffi/pubspec.yaml | 2 +- .../fuchsia/dart_runner/embedder/pubspec.yaml | 2 +- .../dart_runner/vmservice/pubspec.yaml | 2 +- .../fuchsia/flutter/kernel/pubspec.yaml | 2 +- .../embedder/child-view/pubspec.yaml | 2 +- .../embedder/parent-view/pubspec.yaml | 2 +- .../mouse-input/mouse-input-view/pubspec.yaml | 2 +- .../text-input/text-input-view/pubspec.yaml | 2 +- .../embedding-flutter-view/pubspec.yaml | 2 +- .../touch-input/touch-input-view/pubspec.yaml | 2 +- .../dart/profiler_symbols/pubspec.yaml | 2 +- .../src/flutter/shell/vmservice/pubspec.yaml | 2 +- .../sky/packages/sky_engine/pubspec.yaml | 2 +- .../android_background_image/pubspec.yaml | 2 +- .../flutter/testing/benchmark/pubspec.yaml | 2 +- engine/src/flutter/testing/dart/pubspec.yaml | 2 +- .../src/flutter/testing/litetest/pubspec.yaml | 2 +- .../flutter/testing/scenario_app/pubspec.yaml | 2 +- .../testing/skia_gold_client/pubspec.yaml | 2 +- .../testing/smoke_test_failure/pubspec.yaml | 2 +- .../src/flutter/testing/symbols/pubspec.yaml | 2 +- .../web_locale_keymap/pubspec.yaml | 2 +- .../third_party/web_test_fonts/pubspec.yaml | 2 +- .../third_party/web_unicode/pubspec.yaml | 2 +- .../flutter/tools/android_lint/pubspec.yaml | 2 +- .../src/flutter/tools/api_check/pubspec.yaml | 2 +- .../src/flutter/tools/clang_tidy/pubspec.yaml | 2 +- .../flutter/tools/const_finder/pubspec.yaml | 2 +- .../tools/gen_web_locale_keymap/pubspec.yaml | 2 +- .../src/flutter/tools/githooks/pubspec.yaml | 2 +- .../src/flutter/tools/licenses/pubspec.yaml | 2 +- .../flutter/tools/path_ops/dart/pubspec.yaml | 2 +- engine/src/flutter/web_sdk/pubspec.yaml | 2 +- .../web_sdk/web_engine_tester/pubspec.yaml | 2 +- .../web_sdk/web_test_utils/pubspec.yaml | 2 +- 43 files changed, 96 insertions(+), 69 deletions(-) diff --git a/engine/src/flutter/ci/bin/format.dart b/engine/src/flutter/ci/bin/format.dart index e68e046533c..9f6674c1ef6 100644 --- a/engine/src/flutter/ci/bin/format.dart +++ b/engine/src/flutter/ci/bin/format.dart @@ -304,14 +304,19 @@ abstract class FormatChecker { /// Checks and formats C++/ObjC/Shader files using clang-format. class ClangFormatChecker extends FormatChecker { ClangFormatChecker({ - super.processManager, - required super.baseGitRef, - required super.repoDir, + ProcessManager processManager = const LocalProcessManager(), + required String baseGitRef, + required Directory repoDir, required Directory srcDir, - super.allFiles, - super.messageCallback, + bool allFiles = false, + MessageCallback? messageCallback, }) : super( + processManager: processManager, + baseGitRef: baseGitRef, + repoDir: repoDir, srcDir: srcDir, + allFiles: allFiles, + messageCallback: messageCallback, ) { /*late*/ String clangOs; if (Platform.isLinux) { @@ -444,14 +449,19 @@ class ClangFormatChecker extends FormatChecker { /// Checks the format of Java files uing the Google Java format checker. class JavaFormatChecker extends FormatChecker { JavaFormatChecker({ - super.processManager, - required super.baseGitRef, - required super.repoDir, + ProcessManager processManager = const LocalProcessManager(), + required String baseGitRef, + required Directory repoDir, required Directory srcDir, - super.allFiles, - super.messageCallback, + bool allFiles = false, + MessageCallback? messageCallback, }) : super( + processManager: processManager, + baseGitRef: baseGitRef, + repoDir: repoDir, srcDir: srcDir, + allFiles: allFiles, + messageCallback: messageCallback, ) { googleJavaFormatJar = File( path.absolute( @@ -586,14 +596,19 @@ class JavaFormatChecker extends FormatChecker { /// Checks the format of any BUILD.gn files using the "gn format" command. class GnFormatChecker extends FormatChecker { GnFormatChecker({ - super.processManager, - required super.baseGitRef, + ProcessManager processManager = const LocalProcessManager(), + required String baseGitRef, required Directory repoDir, - required super.srcDir, - super.allFiles, - super.messageCallback, + required Directory srcDir, + bool allFiles = false, + MessageCallback? messageCallback, }) : super( + processManager: processManager, + baseGitRef: baseGitRef, repoDir: repoDir, + srcDir: srcDir, + allFiles: allFiles, + messageCallback: messageCallback, ) { gnBinary = File( path.join( @@ -672,14 +687,19 @@ class GnFormatChecker extends FormatChecker { /// Checks the format of any .py files using the "yapf" command. class PythonFormatChecker extends FormatChecker { PythonFormatChecker({ - super.processManager, - required super.baseGitRef, + ProcessManager processManager = const LocalProcessManager(), + required String baseGitRef, required Directory repoDir, - required super.srcDir, - super.allFiles, - super.messageCallback, + required Directory srcDir, + bool allFiles = false, + MessageCallback? messageCallback, }) : super( + processManager: processManager, + baseGitRef: baseGitRef, repoDir: repoDir, + srcDir: srcDir, + allFiles: allFiles, + messageCallback: messageCallback, ) { yapfBin = File(path.join( repoDir.absolute.path, @@ -767,13 +787,20 @@ class _GrepResult { /// Checks for trailing whitspace in Dart files. class WhitespaceFormatChecker extends FormatChecker { WhitespaceFormatChecker({ - super.processManager, - required super.baseGitRef, - required super.repoDir, - required super.srcDir, - super.allFiles, - super.messageCallback, - }); + ProcessManager processManager = const LocalProcessManager(), + required String baseGitRef, + required Directory repoDir, + required Directory srcDir, + bool allFiles = false, + MessageCallback? messageCallback, + }) : super( + processManager: processManager, + baseGitRef: baseGitRef, + repoDir: repoDir, + srcDir: srcDir, + allFiles: allFiles, + messageCallback: messageCallback, + ); @override Future checkFormatting() async { diff --git a/engine/src/flutter/ci/pubspec.yaml b/engine/src/flutter/ci/pubspec.yaml index 6b09e88641e..11583566998 100644 --- a/engine/src/flutter/ci/pubspec.yaml +++ b/engine/src/flutter/ci/pubspec.yaml @@ -5,7 +5,7 @@ name: ci_scripts publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0-0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/flutter_frontend_server/pubspec.yaml b/engine/src/flutter/flutter_frontend_server/pubspec.yaml index 48ed1a4928a..b492661d480 100644 --- a/engine/src/flutter/flutter_frontend_server/pubspec.yaml +++ b/engine/src/flutter/flutter_frontend_server/pubspec.yaml @@ -18,7 +18,7 @@ homepage: https://flutter.dev # relative to this directory into //third_party/dart environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0 <3.0.0" dependencies: args: any diff --git a/engine/src/flutter/impeller/tessellator/dart/pubspec.yaml b/engine/src/flutter/impeller/tessellator/dart/pubspec.yaml index fc173208557..4f09e8272da 100644 --- a/engine/src/flutter/impeller/tessellator/dart/pubspec.yaml +++ b/engine/src/flutter/impeller/tessellator/dart/pubspec.yaml @@ -8,4 +8,4 @@ publish_to: none homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/lib/snapshot/pubspec.yaml b/engine/src/flutter/lib/snapshot/pubspec.yaml index bb7cd30be46..f9aaabf8801 100644 --- a/engine/src/flutter/lib/snapshot/pubspec.yaml +++ b/engine/src/flutter/lib/snapshot/pubspec.yaml @@ -5,4 +5,4 @@ # This file is needed by Fuchsia's dart_library template. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/lib/web_ui/pubspec.yaml b/engine/src/flutter/lib/web_ui/pubspec.yaml index eb402787515..3f688e4af96 100644 --- a/engine/src/flutter/lib/web_ui/pubspec.yaml +++ b/engine/src/flutter/lib/web_ui/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none # Keep the SDK version range in sync with pubspecs under web_sdk environment: - sdk: '>=2.19.0 <4.0.0' + sdk: ">=2.19.0 <3.0.0" dependencies: js: 0.6.4 diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml index 16fe4cdd83d..b6f4924b506 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml index 121b528580c..d82a3ccf9e8 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml @@ -5,7 +5,7 @@ name: zircon environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Uncomment block for local testing diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml index 5e3507cef3c..51113aa82fd 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml @@ -1,7 +1,7 @@ name: zircon_ffi environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: ffi: ^1.0.0 diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml index 0bda0be6f7c..95d02521eaa 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml @@ -6,5 +6,5 @@ # template in BUILD.gn. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml index 09da15ac00b..d0e8360c334 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml @@ -3,5 +3,5 @@ # found in the LICENSE file. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/pubspec.yaml index 16fe4cdd83d..b6f4924b506 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/kernel/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml index fc1d582237c..a50988f1a4b 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml @@ -5,4 +5,4 @@ name: child_view2 environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml index 201cf3fa569..151abb7e2d1 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml @@ -5,4 +5,4 @@ name: parent-view2 environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml index c3196484ca7..a557dbe433a 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: mouse-input-view environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml index f15d9379994..30c6e7096ef 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: text-input-view environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml index 5051384ec5b..fcd78ccdc8d 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml @@ -5,4 +5,4 @@ name: embedding-flutter-view environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml index 3e8e25f294c..cc78c78f090 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: touch-input-view environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' diff --git a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml index 519e6f49fd1..56bddf8c627 100644 --- a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml +++ b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml @@ -4,7 +4,7 @@ name: profiler_symbols environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' version: 0 description: Extracts a minimal symbols table for the Dart VM profiler author: Dart Team diff --git a/engine/src/flutter/shell/vmservice/pubspec.yaml b/engine/src/flutter/shell/vmservice/pubspec.yaml index d8061c2f61d..7c1f613b340 100644 --- a/engine/src/flutter/shell/vmservice/pubspec.yaml +++ b/engine/src/flutter/shell/vmservice/pubspec.yaml @@ -5,4 +5,4 @@ name: vmservice_snapshot publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' diff --git a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml index c613749d4bb..9d357357db3 100644 --- a/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml +++ b/engine/src/flutter/sky/packages/sky_engine/pubspec.yaml @@ -5,4 +5,4 @@ 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: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0-0 <3.0.0" diff --git a/engine/src/flutter/testing/android_background_image/pubspec.yaml b/engine/src/flutter/testing/android_background_image/pubspec.yaml index 82a37fd9f48..361922d8fd2 100644 --- a/engine/src/flutter/testing/android_background_image/pubspec.yaml +++ b/engine/src/flutter/testing/android_background_image/pubspec.yaml @@ -5,7 +5,7 @@ name: android_background_image publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or diff --git a/engine/src/flutter/testing/benchmark/pubspec.yaml b/engine/src/flutter/testing/benchmark/pubspec.yaml index dc860ed38d7..9aa5acda389 100644 --- a/engine/src/flutter/testing/benchmark/pubspec.yaml +++ b/engine/src/flutter/testing/benchmark/pubspec.yaml @@ -5,7 +5,7 @@ name: flutter_engine_benchmark publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0-0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/testing/dart/pubspec.yaml b/engine/src/flutter/testing/dart/pubspec.yaml index c2f4df9744c..cebfd589104 100644 --- a/engine/src/flutter/testing/dart/pubspec.yaml +++ b/engine/src/flutter/testing/dart/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.17.0 <3.0.0' dependencies: litetest: any diff --git a/engine/src/flutter/testing/litetest/pubspec.yaml b/engine/src/flutter/testing/litetest/pubspec.yaml index 392ce6411fc..905a4999a9d 100644 --- a/engine/src/flutter/testing/litetest/pubspec.yaml +++ b/engine/src/flutter/testing/litetest/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async_helper: any diff --git a/engine/src/flutter/testing/scenario_app/pubspec.yaml b/engine/src/flutter/testing/scenario_app/pubspec.yaml index c90a33d7f32..696d3871584 100644 --- a/engine/src/flutter/testing/scenario_app/pubspec.yaml +++ b/engine/src/flutter/testing/scenario_app/pubspec.yaml @@ -5,7 +5,7 @@ name: scenario_app publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.17.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or diff --git a/engine/src/flutter/testing/skia_gold_client/pubspec.yaml b/engine/src/flutter/testing/skia_gold_client/pubspec.yaml index 9f39ae9b280..bd6d3082d7c 100644 --- a/engine/src/flutter/testing/skia_gold_client/pubspec.yaml +++ b/engine/src/flutter/testing/skia_gold_client/pubspec.yaml @@ -5,7 +5,7 @@ name: skia_gold_client publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/dart/pkg, //third_party/dart/third_party/pkg, or diff --git a/engine/src/flutter/testing/smoke_test_failure/pubspec.yaml b/engine/src/flutter/testing/smoke_test_failure/pubspec.yaml index df2f11055e7..c51c8cecbe7 100644 --- a/engine/src/flutter/testing/smoke_test_failure/pubspec.yaml +++ b/engine/src/flutter/testing/smoke_test_failure/pubspec.yaml @@ -5,7 +5,7 @@ name: smoke_test_failure publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/dart/pkg or //third_party/dart/third_party/pkg. diff --git a/engine/src/flutter/testing/symbols/pubspec.yaml b/engine/src/flutter/testing/symbols/pubspec.yaml index ab9d4b49a8d..6f78767c109 100644 --- a/engine/src/flutter/testing/symbols/pubspec.yaml +++ b/engine/src/flutter/testing/symbols/pubspec.yaml @@ -5,7 +5,7 @@ name: verify_exported publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/third_party/web_locale_keymap/pubspec.yaml b/engine/src/flutter/third_party/web_locale_keymap/pubspec.yaml index 2da80a46c51..c9c7518d01e 100644 --- a/engine/src/flutter/third_party/web_locale_keymap/pubspec.yaml +++ b/engine/src/flutter/third_party/web_locale_keymap/pubspec.yaml @@ -3,7 +3,7 @@ name: web_locale_keymap publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0 <3.0.0" dev_dependencies: test: ^1.21.7 diff --git a/engine/src/flutter/third_party/web_test_fonts/pubspec.yaml b/engine/src/flutter/third_party/web_test_fonts/pubspec.yaml index 6c2af49caa2..427accd1f6a 100644 --- a/engine/src/flutter/third_party/web_test_fonts/pubspec.yaml +++ b/engine/src/flutter/third_party/web_test_fonts/pubspec.yaml @@ -3,7 +3,7 @@ name: web_test_fonts publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0-0 <3.0.0" dev_dependencies: args: any diff --git a/engine/src/flutter/third_party/web_unicode/pubspec.yaml b/engine/src/flutter/third_party/web_unicode/pubspec.yaml index 99b6d98c566..8d9281ee953 100644 --- a/engine/src/flutter/third_party/web_unicode/pubspec.yaml +++ b/engine/src/flutter/third_party/web_unicode/pubspec.yaml @@ -3,7 +3,7 @@ name: web_unicode publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0-0 <3.0.0" dev_dependencies: args: any diff --git a/engine/src/flutter/tools/android_lint/pubspec.yaml b/engine/src/flutter/tools/android_lint/pubspec.yaml index 4c62944ea46..81eb92b2088 100644 --- a/engine/src/flutter/tools/android_lint/pubspec.yaml +++ b/engine/src/flutter/tools/android_lint/pubspec.yaml @@ -4,7 +4,7 @@ name: android_lint environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party.pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/tools/api_check/pubspec.yaml b/engine/src/flutter/tools/api_check/pubspec.yaml index 14578976563..60a1493a024 100644 --- a/engine/src/flutter/tools/api_check/pubspec.yaml +++ b/engine/src/flutter/tools/api_check/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/tools/clang_tidy/pubspec.yaml b/engine/src/flutter/tools/clang_tidy/pubspec.yaml index 46befe2929d..7e89c33285c 100644 --- a/engine/src/flutter/tools/clang_tidy/pubspec.yaml +++ b/engine/src/flutter/tools/clang_tidy/pubspec.yaml @@ -5,7 +5,7 @@ name: clang_tidy publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0-0 <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party/pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/tools/const_finder/pubspec.yaml b/engine/src/flutter/tools/const_finder/pubspec.yaml index b174754fff0..9e4804c8aa4 100644 --- a/engine/src/flutter/tools/const_finder/pubspec.yaml +++ b/engine/src/flutter/tools/const_finder/pubspec.yaml @@ -6,7 +6,7 @@ name: const_finder publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.17.0 <4.0.0" # Do not add any dependencies that require more than what is provided in # //third_party/dart/pkg or //third_party/dart/third_party/pkg. diff --git a/engine/src/flutter/tools/gen_web_locale_keymap/pubspec.yaml b/engine/src/flutter/tools/gen_web_locale_keymap/pubspec.yaml index e7987d6338a..a1c1f055ccd 100644 --- a/engine/src/flutter/tools/gen_web_locale_keymap/pubspec.yaml +++ b/engine/src/flutter/tools/gen_web_locale_keymap/pubspec.yaml @@ -2,7 +2,7 @@ name: gen_web_keyboard_keymap description: Generates keyboard layouts for Web from external sources. environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.18.0-0 <3.0.0" dependencies: args: any diff --git a/engine/src/flutter/tools/githooks/pubspec.yaml b/engine/src/flutter/tools/githooks/pubspec.yaml index 6b5bb5c2340..891f45852b1 100644 --- a/engine/src/flutter/tools/githooks/pubspec.yaml +++ b/engine/src/flutter/tools/githooks/pubspec.yaml @@ -5,7 +5,7 @@ name: githooks publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.12.0-0.0.dev <3.0.0' # Do not add any dependencies that require more than what is provided in # //third_party.pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/tools/licenses/pubspec.yaml b/engine/src/flutter/tools/licenses/pubspec.yaml index 85f69a2bad5..71e93ce5ed3 100644 --- a/engine/src/flutter/tools/licenses/pubspec.yaml +++ b/engine/src/flutter/tools/licenses/pubspec.yaml @@ -5,7 +5,7 @@ name: licenses publish_to: none environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.18.0 <3.0.0' # Do not add any dependencies that require more than what is provided # in //third_party.pkg, //third_party/dart/pkg, or diff --git a/engine/src/flutter/tools/path_ops/dart/pubspec.yaml b/engine/src/flutter/tools/path_ops/dart/pubspec.yaml index db4d16542f5..2db19083077 100644 --- a/engine/src/flutter/tools/path_ops/dart/pubspec.yaml +++ b/engine/src/flutter/tools/path_ops/dart/pubspec.yaml @@ -8,7 +8,7 @@ publish_to: none homepage: https://github.com/flutter/engine/tree/main/tools/path_ops environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: '>=2.17.0 <3.0.0' dev_dependencies: litetest: any diff --git a/engine/src/flutter/web_sdk/pubspec.yaml b/engine/src/flutter/web_sdk/pubspec.yaml index d452fbe0a4d..c97581317f1 100644 --- a/engine/src/flutter/web_sdk/pubspec.yaml +++ b/engine/src/flutter/web_sdk/pubspec.yaml @@ -2,7 +2,7 @@ name: web_sdk_tests # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml environment: - sdk: '>=2.19.0 <4.0.0' + sdk: ">=2.19.0 <3.0.0" dependencies: args: 2.3.1 diff --git a/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml b/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml index 06ab52b3197..820ad1629eb 100644 --- a/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml +++ b/engine/src/flutter/web_sdk/web_engine_tester/pubspec.yaml @@ -2,7 +2,7 @@ name: web_engine_tester # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0-0 <3.0.0" dependencies: js: 0.6.4 diff --git a/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml b/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml index c9b8530271a..03aac1e7e62 100644 --- a/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml +++ b/engine/src/flutter/web_sdk/web_test_utils/pubspec.yaml @@ -2,7 +2,7 @@ name: web_test_utils # Keep the SDK version range in sync with lib/web_ui/pubspec.yaml environment: - sdk: '>=3.0.0-0 <4.0.0' + sdk: ">=2.12.0-0 <3.0.0" dependencies: collection: 1.15.0