From dd042ef3eea2205d0407664b41c3a0c9738fd143 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Thu, 9 Mar 2023 09:15:42 -0800 Subject: [PATCH 1/4] WIP --- ci/pubspec.yaml | 2 +- flutter_frontend_server/pubspec.yaml | 2 +- impeller/tessellator/dart/pubspec.yaml | 2 +- lib/snapshot/pubspec.yaml | 2 +- lib/web_ui/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml | 2 +- shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml | 2 +- shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml | 2 +- shell/platform/fuchsia/flutter/kernel/pubspec.yaml | 2 +- .../flutter/tests/integration/embedder/child-view/pubspec.yaml | 2 +- .../flutter/tests/integration/embedder/parent-view/pubspec.yaml | 2 +- .../tests/integration/mouse-input/mouse-input-view/pubspec.yaml | 2 +- .../tests/integration/text-input/text-input-view/pubspec.yaml | 2 +- .../integration/touch-input/embedding-flutter-view/pubspec.yaml | 2 +- .../tests/integration/touch-input/touch-input-view/pubspec.yaml | 2 +- .../platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml | 2 +- shell/vmservice/pubspec.yaml | 2 +- sky/packages/sky_engine/pubspec.yaml | 2 +- testing/android_background_image/pubspec.yaml | 2 +- testing/benchmark/pubspec.yaml | 2 +- testing/dart/pubspec.yaml | 2 +- testing/litetest/pubspec.yaml | 2 +- testing/scenario_app/pubspec.yaml | 2 +- testing/skia_gold_client/pubspec.yaml | 2 +- testing/smoke_test_failure/pubspec.yaml | 2 +- testing/symbols/pubspec.yaml | 2 +- third_party/web_locale_keymap/pubspec.yaml | 2 +- third_party/web_test_fonts/pubspec.yaml | 2 +- third_party/web_unicode/pubspec.yaml | 2 +- tools/android_lint/pubspec.yaml | 2 +- tools/api_check/pubspec.yaml | 2 +- tools/clang_tidy/pubspec.yaml | 2 +- tools/const_finder/pubspec.yaml | 2 +- tools/gen_web_locale_keymap/pubspec.yaml | 2 +- tools/githooks/pubspec.yaml | 2 +- tools/licenses/pubspec.yaml | 2 +- tools/path_ops/dart/pubspec.yaml | 2 +- web_sdk/pubspec.yaml | 2 +- web_sdk/web_engine_tester/pubspec.yaml | 2 +- web_sdk/web_test_utils/pubspec.yaml | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ci/pubspec.yaml b/ci/pubspec.yaml index 11583566998d5..139c2438b55c7 100644 --- a/ci/pubspec.yaml +++ b/ci/pubspec.yaml @@ -5,7 +5,7 @@ name: ci_scripts publish_to: none environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/flutter_frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml index b492661d4804b..cb5a2f8a7d8a8 100644 --- a/flutter_frontend_server/pubspec.yaml +++ b/flutter_frontend_server/pubspec.yaml @@ -18,7 +18,7 @@ homepage: https://flutter.dev # relative to this directory into //third_party/dart environment: - sdk: ">=2.12.0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: args: any diff --git a/impeller/tessellator/dart/pubspec.yaml b/impeller/tessellator/dart/pubspec.yaml index 4f09e8272da5c..6295410bd1a14 100644 --- a/impeller/tessellator/dart/pubspec.yaml +++ b/impeller/tessellator/dart/pubspec.yaml @@ -8,4 +8,4 @@ publish_to: none homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/lib/snapshot/pubspec.yaml b/lib/snapshot/pubspec.yaml index f9aaabf880163..ad1534e05d0e1 100644 --- a/lib/snapshot/pubspec.yaml +++ b/lib/snapshot/pubspec.yaml @@ -5,4 +5,4 @@ # This file is needed by Fuchsia's dart_library template. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index 3f688e4af962a..8750913dd8675 100644 --- a/lib/web_ui/pubspec.yaml +++ b/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 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: js: 0.6.4 diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml index b6f4924b50621..ead40d75b59f9 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml index d82a3ccf9e8b4..5704b7eab138c 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml @@ -5,7 +5,7 @@ name: zircon environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' # Uncomment block for local testing diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml index 51113aa82fdd2..7d643c8cadca5 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml @@ -1,7 +1,7 @@ name: zircon_ffi environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' dependencies: ffi: ^1.0.0 diff --git a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml index 95d02521eaa7c..0063d45fdd1d0 100644 --- a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml +++ b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml @@ -6,5 +6,5 @@ # template in BUILD.gn. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml index d0e8360c33486..67b68c9a79485 100644 --- a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml +++ b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml @@ -3,5 +3,5 @@ # found in the LICENSE file. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml index b6f4924b50621..ead40d75b59f9 100644 --- a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml index a50988f1a4baf..cccd41e3f7c97 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml @@ -5,4 +5,4 @@ name: child_view2 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml index 151abb7e2d131..f8c26a826e592 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml @@ -5,4 +5,4 @@ name: parent-view2 environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml index a557dbe433abd..791bf5a6f6016 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: mouse-input-view environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml index 30c6e7096ef8c..f203734cb3d2c 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: text-input-view environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml index fcd78ccdc8d9a..0c9cdd3f4552f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml @@ -5,4 +5,4 @@ name: embedding-flutter-view environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml index cc78c78f090eb..d3d2498e08e1f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: touch-input-view environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml index 56bddf8c6277a..8832846fd0790 100644 --- a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml +++ b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml @@ -4,7 +4,7 @@ name: profiler_symbols environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' version: 0 description: Extracts a minimal symbols table for the Dart VM profiler author: Dart Team diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml index 7c1f613b34059..3663ec52799ce 100644 --- a/shell/vmservice/pubspec.yaml +++ b/shell/vmservice/pubspec.yaml @@ -5,4 +5,4 @@ name: vmservice_snapshot publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' \ No newline at end of file diff --git a/sky/packages/sky_engine/pubspec.yaml b/sky/packages/sky_engine/pubspec.yaml index 9d357357db336..6c76d63969add 100644 --- a/sky/packages/sky_engine/pubspec.yaml +++ b/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: ">=2.12.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' diff --git a/testing/android_background_image/pubspec.yaml b/testing/android_background_image/pubspec.yaml index 361922d8fd21f..547b62b38fd00 100644 --- a/testing/android_background_image/pubspec.yaml +++ b/testing/android_background_image/pubspec.yaml @@ -5,7 +5,7 @@ name: android_background_image publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/testing/benchmark/pubspec.yaml b/testing/benchmark/pubspec.yaml index 9aa5acda38916..8fc657a9b1b3e 100644 --- a/testing/benchmark/pubspec.yaml +++ b/testing/benchmark/pubspec.yaml @@ -5,7 +5,7 @@ name: flutter_engine_benchmark publish_to: none environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/testing/dart/pubspec.yaml b/testing/dart/pubspec.yaml index cebfd589104ab..162fbf0e3a5d5 100644 --- a/testing/dart/pubspec.yaml +++ b/testing/dart/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' dependencies: litetest: any diff --git a/testing/litetest/pubspec.yaml b/testing/litetest/pubspec.yaml index 905a4999a9d30..5aa4494ec15ad 100644 --- a/testing/litetest/pubspec.yaml +++ b/testing/litetest/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' dependencies: async_helper: any diff --git a/testing/scenario_app/pubspec.yaml b/testing/scenario_app/pubspec.yaml index 696d3871584ad..7f33a351e88d8 100644 --- a/testing/scenario_app/pubspec.yaml +++ b/testing/scenario_app/pubspec.yaml @@ -5,7 +5,7 @@ name: scenario_app publish_to: none environment: - sdk: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/testing/skia_gold_client/pubspec.yaml b/testing/skia_gold_client/pubspec.yaml index bd6d3082d7c2d..f59db7e1f9db4 100644 --- a/testing/skia_gold_client/pubspec.yaml +++ b/testing/skia_gold_client/pubspec.yaml @@ -5,7 +5,7 @@ name: skia_gold_client publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/testing/smoke_test_failure/pubspec.yaml b/testing/smoke_test_failure/pubspec.yaml index c51c8cecbe7e8..9645439eafb55 100644 --- a/testing/smoke_test_failure/pubspec.yaml +++ b/testing/smoke_test_failure/pubspec.yaml @@ -5,7 +5,7 @@ name: smoke_test_failure publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-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/testing/symbols/pubspec.yaml b/testing/symbols/pubspec.yaml index 6f78767c10912..a8cb309ce20c0 100644 --- a/testing/symbols/pubspec.yaml +++ b/testing/symbols/pubspec.yaml @@ -5,7 +5,7 @@ name: verify_exported publish_to: none environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/third_party/web_locale_keymap/pubspec.yaml b/third_party/web_locale_keymap/pubspec.yaml index c9c7518d01ed1..076a0e685611b 100644 --- a/third_party/web_locale_keymap/pubspec.yaml +++ b/third_party/web_locale_keymap/pubspec.yaml @@ -3,7 +3,7 @@ name: web_locale_keymap publish_to: none environment: - sdk: ">=2.12.0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dev_dependencies: test: ^1.21.7 diff --git a/third_party/web_test_fonts/pubspec.yaml b/third_party/web_test_fonts/pubspec.yaml index 427accd1f6a67..3353d856d8bf7 100644 --- a/third_party/web_test_fonts/pubspec.yaml +++ b/third_party/web_test_fonts/pubspec.yaml @@ -3,7 +3,7 @@ name: web_test_fonts publish_to: none environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dev_dependencies: args: any diff --git a/third_party/web_unicode/pubspec.yaml b/third_party/web_unicode/pubspec.yaml index 8d9281ee95302..46a7efc859d39 100644 --- a/third_party/web_unicode/pubspec.yaml +++ b/third_party/web_unicode/pubspec.yaml @@ -3,7 +3,7 @@ name: web_unicode publish_to: none environment: - sdk: ">=2.12.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dev_dependencies: args: any diff --git a/tools/android_lint/pubspec.yaml b/tools/android_lint/pubspec.yaml index 81eb92b208841..f3b29705b69cd 100644 --- a/tools/android_lint/pubspec.yaml +++ b/tools/android_lint/pubspec.yaml @@ -4,7 +4,7 @@ name: android_lint environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/tools/api_check/pubspec.yaml b/tools/api_check/pubspec.yaml index 60a1493a0247a..2d885b8272c8e 100644 --- a/tools/api_check/pubspec.yaml +++ b/tools/api_check/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/tools/clang_tidy/pubspec.yaml b/tools/clang_tidy/pubspec.yaml index 7e89c33285ceb..42e64976034b4 100644 --- a/tools/clang_tidy/pubspec.yaml +++ b/tools/clang_tidy/pubspec.yaml @@ -5,7 +5,7 @@ name: clang_tidy publish_to: none environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/tools/const_finder/pubspec.yaml b/tools/const_finder/pubspec.yaml index 9e4804c8aa400..8a05b24c010e7 100644 --- a/tools/const_finder/pubspec.yaml +++ b/tools/const_finder/pubspec.yaml @@ -6,7 +6,7 @@ name: const_finder publish_to: none environment: - sdk: ">=2.17.0 <4.0.0" + sdk: '>=2.19.0-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/tools/gen_web_locale_keymap/pubspec.yaml b/tools/gen_web_locale_keymap/pubspec.yaml index a1c1f055ccd1b..f3d16aea94170 100644 --- a/tools/gen_web_locale_keymap/pubspec.yaml +++ b/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: ">=2.18.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: args: any diff --git a/tools/githooks/pubspec.yaml b/tools/githooks/pubspec.yaml index 891f45852b1b8..8548c13fe0f52 100644 --- a/tools/githooks/pubspec.yaml +++ b/tools/githooks/pubspec.yaml @@ -5,7 +5,7 @@ name: githooks publish_to: none environment: - sdk: '>=2.12.0-0.0.dev <3.0.0' + sdk: '>=2.19.0-0 <4.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/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml index 71e93ce5ed377..d404aea43cc74 100644 --- a/tools/licenses/pubspec.yaml +++ b/tools/licenses/pubspec.yaml @@ -5,7 +5,7 @@ name: licenses publish_to: none environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0-0 <4.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/tools/path_ops/dart/pubspec.yaml b/tools/path_ops/dart/pubspec.yaml index 2db190830779d..06e490a57a4d1 100644 --- a/tools/path_ops/dart/pubspec.yaml +++ b/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: '>=2.17.0 <3.0.0' + sdk: '>=2.19.0-0 <4.0.0' dev_dependencies: litetest: any diff --git a/web_sdk/pubspec.yaml b/web_sdk/pubspec.yaml index c97581317f1ef..4eeaede4ed3eb 100644 --- a/web_sdk/pubspec.yaml +++ b/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 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: args: 2.3.1 diff --git a/web_sdk/web_engine_tester/pubspec.yaml b/web_sdk/web_engine_tester/pubspec.yaml index 820ad1629eb7c..e18e7a74db282 100644 --- a/web_sdk/web_engine_tester/pubspec.yaml +++ b/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: ">=2.12.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: js: 0.6.4 diff --git a/web_sdk/web_test_utils/pubspec.yaml b/web_sdk/web_test_utils/pubspec.yaml index 03aac1e7e629a..dd21a565e5d0d 100644 --- a/web_sdk/web_test_utils/pubspec.yaml +++ b/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: ">=2.12.0-0 <3.0.0" + sdk: '>=2.19.0-0 <4.0.0' dependencies: collection: 1.15.0 From 23afc47e1b90ff9df177a8f1dc91cfd06564b382 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Thu, 9 Mar 2023 10:00:37 -0800 Subject: [PATCH 2/4] fix lints --- ci/bin/format.dart | 81 ++++++++++++------------------------ shell/vmservice/pubspec.yaml | 2 +- 2 files changed, 28 insertions(+), 55 deletions(-) diff --git a/ci/bin/format.dart b/ci/bin/format.dart index 9f6674c1ef69a..e68e046533c6f 100644 --- a/ci/bin/format.dart +++ b/ci/bin/format.dart @@ -304,19 +304,14 @@ abstract class FormatChecker { /// Checks and formats C++/ObjC/Shader files using clang-format. class ClangFormatChecker extends FormatChecker { ClangFormatChecker({ - ProcessManager processManager = const LocalProcessManager(), - required String baseGitRef, - required Directory repoDir, + super.processManager, + required super.baseGitRef, + required super.repoDir, required Directory srcDir, - bool allFiles = false, - MessageCallback? messageCallback, + super.allFiles, + super.messageCallback, }) : super( - processManager: processManager, - baseGitRef: baseGitRef, - repoDir: repoDir, srcDir: srcDir, - allFiles: allFiles, - messageCallback: messageCallback, ) { /*late*/ String clangOs; if (Platform.isLinux) { @@ -449,19 +444,14 @@ class ClangFormatChecker extends FormatChecker { /// Checks the format of Java files uing the Google Java format checker. class JavaFormatChecker extends FormatChecker { JavaFormatChecker({ - ProcessManager processManager = const LocalProcessManager(), - required String baseGitRef, - required Directory repoDir, + super.processManager, + required super.baseGitRef, + required super.repoDir, required Directory srcDir, - bool allFiles = false, - MessageCallback? messageCallback, + super.allFiles, + super.messageCallback, }) : super( - processManager: processManager, - baseGitRef: baseGitRef, - repoDir: repoDir, srcDir: srcDir, - allFiles: allFiles, - messageCallback: messageCallback, ) { googleJavaFormatJar = File( path.absolute( @@ -596,19 +586,14 @@ class JavaFormatChecker extends FormatChecker { /// Checks the format of any BUILD.gn files using the "gn format" command. class GnFormatChecker extends FormatChecker { GnFormatChecker({ - ProcessManager processManager = const LocalProcessManager(), - required String baseGitRef, + super.processManager, + required super.baseGitRef, required Directory repoDir, - required Directory srcDir, - bool allFiles = false, - MessageCallback? messageCallback, + required super.srcDir, + super.allFiles, + super.messageCallback, }) : super( - processManager: processManager, - baseGitRef: baseGitRef, repoDir: repoDir, - srcDir: srcDir, - allFiles: allFiles, - messageCallback: messageCallback, ) { gnBinary = File( path.join( @@ -687,19 +672,14 @@ class GnFormatChecker extends FormatChecker { /// Checks the format of any .py files using the "yapf" command. class PythonFormatChecker extends FormatChecker { PythonFormatChecker({ - ProcessManager processManager = const LocalProcessManager(), - required String baseGitRef, + super.processManager, + required super.baseGitRef, required Directory repoDir, - required Directory srcDir, - bool allFiles = false, - MessageCallback? messageCallback, + required super.srcDir, + super.allFiles, + super.messageCallback, }) : super( - processManager: processManager, - baseGitRef: baseGitRef, repoDir: repoDir, - srcDir: srcDir, - allFiles: allFiles, - messageCallback: messageCallback, ) { yapfBin = File(path.join( repoDir.absolute.path, @@ -787,20 +767,13 @@ class _GrepResult { /// Checks for trailing whitspace in Dart files. class WhitespaceFormatChecker extends FormatChecker { WhitespaceFormatChecker({ - 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, - ); + super.processManager, + required super.baseGitRef, + required super.repoDir, + required super.srcDir, + super.allFiles, + super.messageCallback, + }); @override Future checkFormatting() async { diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml index 3663ec52799ce..1cdb07d95c7cc 100644 --- a/shell/vmservice/pubspec.yaml +++ b/shell/vmservice/pubspec.yaml @@ -5,4 +5,4 @@ name: vmservice_snapshot publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' \ No newline at end of file + sdk: '>=2.19.0-0 <4.0.0' From 629fd0fdc09870f8f820f03ea7ab80ac8ac76d55 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Thu, 9 Mar 2023 13:30:10 -0800 Subject: [PATCH 3/4] Bump to 3.0.0-0 --- ci/pubspec.yaml | 2 +- flutter_frontend_server/pubspec.yaml | 2 +- impeller/tessellator/dart/pubspec.yaml | 2 +- lib/snapshot/pubspec.yaml | 2 +- lib/web_ui/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml | 2 +- shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml | 2 +- shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml | 2 +- shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml | 2 +- shell/platform/fuchsia/flutter/kernel/pubspec.yaml | 2 +- .../flutter/tests/integration/embedder/child-view/pubspec.yaml | 2 +- .../flutter/tests/integration/embedder/parent-view/pubspec.yaml | 2 +- .../tests/integration/mouse-input/mouse-input-view/pubspec.yaml | 2 +- .../tests/integration/text-input/text-input-view/pubspec.yaml | 2 +- .../integration/touch-input/embedding-flutter-view/pubspec.yaml | 2 +- .../tests/integration/touch-input/touch-input-view/pubspec.yaml | 2 +- .../platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml | 2 +- shell/vmservice/pubspec.yaml | 2 +- sky/packages/sky_engine/pubspec.yaml | 2 +- testing/android_background_image/pubspec.yaml | 2 +- testing/benchmark/pubspec.yaml | 2 +- testing/dart/pubspec.yaml | 2 +- testing/litetest/pubspec.yaml | 2 +- testing/scenario_app/pubspec.yaml | 2 +- testing/skia_gold_client/pubspec.yaml | 2 +- testing/smoke_test_failure/pubspec.yaml | 2 +- testing/symbols/pubspec.yaml | 2 +- third_party/web_locale_keymap/pubspec.yaml | 2 +- third_party/web_test_fonts/pubspec.yaml | 2 +- third_party/web_unicode/pubspec.yaml | 2 +- tools/android_lint/pubspec.yaml | 2 +- tools/api_check/pubspec.yaml | 2 +- tools/clang_tidy/pubspec.yaml | 2 +- tools/const_finder/pubspec.yaml | 2 +- tools/gen_web_locale_keymap/pubspec.yaml | 2 +- tools/githooks/pubspec.yaml | 2 +- tools/licenses/pubspec.yaml | 2 +- tools/path_ops/dart/pubspec.yaml | 2 +- web_sdk/pubspec.yaml | 2 +- web_sdk/web_engine_tester/pubspec.yaml | 2 +- web_sdk/web_test_utils/pubspec.yaml | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ci/pubspec.yaml b/ci/pubspec.yaml index 139c2438b55c7..6b09e88641e9c 100644 --- a/ci/pubspec.yaml +++ b/ci/pubspec.yaml @@ -5,7 +5,7 @@ name: ci_scripts publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/flutter_frontend_server/pubspec.yaml b/flutter_frontend_server/pubspec.yaml index cb5a2f8a7d8a8..48ed1a4928a18 100644 --- a/flutter_frontend_server/pubspec.yaml +++ b/flutter_frontend_server/pubspec.yaml @@ -18,7 +18,7 @@ homepage: https://flutter.dev # relative to this directory into //third_party/dart environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: args: any diff --git a/impeller/tessellator/dart/pubspec.yaml b/impeller/tessellator/dart/pubspec.yaml index 6295410bd1a14..fc17320855790 100644 --- a/impeller/tessellator/dart/pubspec.yaml +++ b/impeller/tessellator/dart/pubspec.yaml @@ -8,4 +8,4 @@ publish_to: none homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/lib/snapshot/pubspec.yaml b/lib/snapshot/pubspec.yaml index ad1534e05d0e1..bb7cd30be46ca 100644 --- a/lib/snapshot/pubspec.yaml +++ b/lib/snapshot/pubspec.yaml @@ -5,4 +5,4 @@ # This file is needed by Fuchsia's dart_library template. environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index 8750913dd8675..95e1aaad4bacb 100644 --- a/lib/web_ui/pubspec.yaml +++ b/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-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: js: 0.6.4 diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml index ead40d75b59f9..16fe4cdd83d71 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml index 5704b7eab138c..121b528580c14 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml @@ -5,7 +5,7 @@ name: zircon environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' # Uncomment block for local testing diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml index 7d643c8cadca5..5e3507cef3c23 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml +++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml @@ -1,7 +1,7 @@ name: zircon_ffi environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: ffi: ^1.0.0 diff --git a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml index 0063d45fdd1d0..0bda0be6f7c95 100644 --- a/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml +++ b/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml @@ -6,5 +6,5 @@ # template in BUILD.gn. environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml index 67b68c9a79485..09da15ac00b35 100644 --- a/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml +++ b/shell/platform/fuchsia/dart_runner/vmservice/pubspec.yaml @@ -3,5 +3,5 @@ # found in the LICENSE file. environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml index ead40d75b59f9..16fe4cdd83d71 100644 --- a/shell/platform/fuchsia/flutter/kernel/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/kernel/pubspec.yaml @@ -3,4 +3,4 @@ # found in the LICENSE file. environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml index cccd41e3f7c97..fc1d582237cd2 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/pubspec.yaml @@ -5,4 +5,4 @@ name: child_view2 environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml index f8c26a826e592..201cf3fa56906 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/pubspec.yaml @@ -5,4 +5,4 @@ name: parent-view2 environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml index 791bf5a6f6016..c3196484ca75f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: mouse-input-view environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml index f203734cb3d2c..f15d93799943b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: text-input-view environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml index 0c9cdd3f4552f..5051384ec5bea 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/pubspec.yaml @@ -5,4 +5,4 @@ name: embedding-flutter-view environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml index d3d2498e08e1f..3e8e25f294cbf 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/pubspec.yaml @@ -5,4 +5,4 @@ name: touch-input-view environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml index 8832846fd0790..519e6f49fd1a5 100644 --- a/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml +++ b/shell/platform/fuchsia/runtime/dart/profiler_symbols/pubspec.yaml @@ -4,7 +4,7 @@ name: profiler_symbols environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' version: 0 description: Extracts a minimal symbols table for the Dart VM profiler author: Dart Team diff --git a/shell/vmservice/pubspec.yaml b/shell/vmservice/pubspec.yaml index 1cdb07d95c7cc..d8061c2f61dbb 100644 --- a/shell/vmservice/pubspec.yaml +++ b/shell/vmservice/pubspec.yaml @@ -5,4 +5,4 @@ name: vmservice_snapshot publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/sky/packages/sky_engine/pubspec.yaml b/sky/packages/sky_engine/pubspec.yaml index 6c76d63969add..c613749d4bbc5 100644 --- a/sky/packages/sky_engine/pubspec.yaml +++ b/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: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' diff --git a/testing/android_background_image/pubspec.yaml b/testing/android_background_image/pubspec.yaml index 547b62b38fd00..82a37fd9f4831 100644 --- a/testing/android_background_image/pubspec.yaml +++ b/testing/android_background_image/pubspec.yaml @@ -5,7 +5,7 @@ name: android_background_image publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/testing/benchmark/pubspec.yaml b/testing/benchmark/pubspec.yaml index 8fc657a9b1b3e..dc860ed38d7ca 100644 --- a/testing/benchmark/pubspec.yaml +++ b/testing/benchmark/pubspec.yaml @@ -5,7 +5,7 @@ name: flutter_engine_benchmark publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/testing/dart/pubspec.yaml b/testing/dart/pubspec.yaml index 162fbf0e3a5d5..c2f4df9744cde 100644 --- a/testing/dart/pubspec.yaml +++ b/testing/dart/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: litetest: any diff --git a/testing/litetest/pubspec.yaml b/testing/litetest/pubspec.yaml index 5aa4494ec15ad..392ce6411fcd7 100644 --- a/testing/litetest/pubspec.yaml +++ b/testing/litetest/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: async_helper: any diff --git a/testing/scenario_app/pubspec.yaml b/testing/scenario_app/pubspec.yaml index 7f33a351e88d8..c90a33d7f3204 100644 --- a/testing/scenario_app/pubspec.yaml +++ b/testing/scenario_app/pubspec.yaml @@ -5,7 +5,7 @@ name: scenario_app publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/testing/skia_gold_client/pubspec.yaml b/testing/skia_gold_client/pubspec.yaml index f59db7e1f9db4..9f39ae9b2806e 100644 --- a/testing/skia_gold_client/pubspec.yaml +++ b/testing/skia_gold_client/pubspec.yaml @@ -5,7 +5,7 @@ name: skia_gold_client publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/testing/smoke_test_failure/pubspec.yaml b/testing/smoke_test_failure/pubspec.yaml index 9645439eafb55..df2f11055e778 100644 --- a/testing/smoke_test_failure/pubspec.yaml +++ b/testing/smoke_test_failure/pubspec.yaml @@ -5,7 +5,7 @@ name: smoke_test_failure publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-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/testing/symbols/pubspec.yaml b/testing/symbols/pubspec.yaml index a8cb309ce20c0..ab9d4b49a8d67 100644 --- a/testing/symbols/pubspec.yaml +++ b/testing/symbols/pubspec.yaml @@ -5,7 +5,7 @@ name: verify_exported publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/third_party/web_locale_keymap/pubspec.yaml b/third_party/web_locale_keymap/pubspec.yaml index 076a0e685611b..2da80a46c5108 100644 --- a/third_party/web_locale_keymap/pubspec.yaml +++ b/third_party/web_locale_keymap/pubspec.yaml @@ -3,7 +3,7 @@ name: web_locale_keymap publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dev_dependencies: test: ^1.21.7 diff --git a/third_party/web_test_fonts/pubspec.yaml b/third_party/web_test_fonts/pubspec.yaml index 3353d856d8bf7..6c2af49caa236 100644 --- a/third_party/web_test_fonts/pubspec.yaml +++ b/third_party/web_test_fonts/pubspec.yaml @@ -3,7 +3,7 @@ name: web_test_fonts publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dev_dependencies: args: any diff --git a/third_party/web_unicode/pubspec.yaml b/third_party/web_unicode/pubspec.yaml index 46a7efc859d39..99b6d98c56688 100644 --- a/third_party/web_unicode/pubspec.yaml +++ b/third_party/web_unicode/pubspec.yaml @@ -3,7 +3,7 @@ name: web_unicode publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dev_dependencies: args: any diff --git a/tools/android_lint/pubspec.yaml b/tools/android_lint/pubspec.yaml index f3b29705b69cd..4c62944ea4617 100644 --- a/tools/android_lint/pubspec.yaml +++ b/tools/android_lint/pubspec.yaml @@ -4,7 +4,7 @@ name: android_lint environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/tools/api_check/pubspec.yaml b/tools/api_check/pubspec.yaml index 2d885b8272c8e..1457897656329 100644 --- a/tools/api_check/pubspec.yaml +++ b/tools/api_check/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: none # relative to this directory into //third_party/dart environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/tools/clang_tidy/pubspec.yaml b/tools/clang_tidy/pubspec.yaml index 42e64976034b4..46befe2929db6 100644 --- a/tools/clang_tidy/pubspec.yaml +++ b/tools/clang_tidy/pubspec.yaml @@ -5,7 +5,7 @@ name: clang_tidy publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/tools/const_finder/pubspec.yaml b/tools/const_finder/pubspec.yaml index 8a05b24c010e7..b174754fff0df 100644 --- a/tools/const_finder/pubspec.yaml +++ b/tools/const_finder/pubspec.yaml @@ -6,7 +6,7 @@ name: const_finder publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-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/tools/gen_web_locale_keymap/pubspec.yaml b/tools/gen_web_locale_keymap/pubspec.yaml index f3d16aea94170..e7987d6338aec 100644 --- a/tools/gen_web_locale_keymap/pubspec.yaml +++ b/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: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: args: any diff --git a/tools/githooks/pubspec.yaml b/tools/githooks/pubspec.yaml index 8548c13fe0f52..6b5bb5c2340a7 100644 --- a/tools/githooks/pubspec.yaml +++ b/tools/githooks/pubspec.yaml @@ -5,7 +5,7 @@ name: githooks publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml index d404aea43cc74..85f69a2bad58b 100644 --- a/tools/licenses/pubspec.yaml +++ b/tools/licenses/pubspec.yaml @@ -5,7 +5,7 @@ name: licenses publish_to: none environment: - sdk: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.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/tools/path_ops/dart/pubspec.yaml b/tools/path_ops/dart/pubspec.yaml index 06e490a57a4d1..db4d16542f5f1 100644 --- a/tools/path_ops/dart/pubspec.yaml +++ b/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: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dev_dependencies: litetest: any diff --git a/web_sdk/pubspec.yaml b/web_sdk/pubspec.yaml index 4eeaede4ed3eb..6222f1371364a 100644 --- a/web_sdk/pubspec.yaml +++ b/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-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: args: 2.3.1 diff --git a/web_sdk/web_engine_tester/pubspec.yaml b/web_sdk/web_engine_tester/pubspec.yaml index e18e7a74db282..06ab52b319740 100644 --- a/web_sdk/web_engine_tester/pubspec.yaml +++ b/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: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: js: 0.6.4 diff --git a/web_sdk/web_test_utils/pubspec.yaml b/web_sdk/web_test_utils/pubspec.yaml index dd21a565e5d0d..c9b8530271a9a 100644 --- a/web_sdk/web_test_utils/pubspec.yaml +++ b/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: '>=2.19.0-0 <4.0.0' + sdk: '>=3.0.0-0 <4.0.0' dependencies: collection: 1.15.0 From 9569eaca07ab197a30b04b7a1916de8080a3e031 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 15 Mar 2023 09:47:37 -0700 Subject: [PATCH 4/4] drop web_ui --- lib/web_ui/pubspec.yaml | 2 +- web_sdk/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index 95e1aaad4bacb..eb402787515dd 100644 --- a/lib/web_ui/pubspec.yaml +++ b/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: '>=3.0.0-0 <4.0.0' + sdk: '>=2.19.0 <4.0.0' dependencies: js: 0.6.4 diff --git a/web_sdk/pubspec.yaml b/web_sdk/pubspec.yaml index 6222f1371364a..d452fbe0a4db6 100644 --- a/web_sdk/pubspec.yaml +++ b/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: '>=3.0.0-0 <4.0.0' + sdk: '>=2.19.0 <4.0.0' dependencies: args: 2.3.1