Revert "Bump lower Dart SDK constraints to 3.0 (#40178)" (flutter/engine#40317)

Revert "Bump lower Dart SDK constraints to 3.0"
2026-02-20 02:29:02 +08:00 · 2023-03-15 11:53:00 -07:00 · 2023-03-15 11:53:00 -07:00 · 32b3e66d7c
commit 32b3e66d7c
parent 7904d09dd5
43 changed files with 96 additions and 69 deletions
--- 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<bool> checkFormatting() async {
--- 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
--- 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
--- 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'
--- 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'
--- 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
--- 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'
--- 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
--- 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
--- 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'

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

--- 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'
--- 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'
--- 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'
--- 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'
--- 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'
--- 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'
--- 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'
--- 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 <misc@dartlang.org>
--- 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'
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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