Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit e143b30

Browse files
authored
Bump lower Dart SDK constraints to 3.0 (#40178)
Bump lower Dart SDK constraints to 3.0
1 parent 3ed9f12 commit e143b30

File tree

43 files changed

+69
-96
lines changed

Some content is hidden

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

43 files changed

+69
-96
lines changed

ci/bin/format.dart

Lines changed: 27 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -304,19 +304,14 @@ abstract class FormatChecker {
304304
/// Checks and formats C++/ObjC/Shader files using clang-format.
305305
class ClangFormatChecker extends FormatChecker {
306306
ClangFormatChecker({
307-
ProcessManager processManager = const LocalProcessManager(),
308-
required String baseGitRef,
309-
required Directory repoDir,
307+
super.processManager,
308+
required super.baseGitRef,
309+
required super.repoDir,
310310
required Directory srcDir,
311-
bool allFiles = false,
312-
MessageCallback? messageCallback,
311+
super.allFiles,
312+
super.messageCallback,
313313
}) : super(
314-
processManager: processManager,
315-
baseGitRef: baseGitRef,
316-
repoDir: repoDir,
317314
srcDir: srcDir,
318-
allFiles: allFiles,
319-
messageCallback: messageCallback,
320315
) {
321316
/*late*/ String clangOs;
322317
if (Platform.isLinux) {
@@ -449,19 +444,14 @@ class ClangFormatChecker extends FormatChecker {
449444
/// Checks the format of Java files uing the Google Java format checker.
450445
class JavaFormatChecker extends FormatChecker {
451446
JavaFormatChecker({
452-
ProcessManager processManager = const LocalProcessManager(),
453-
required String baseGitRef,
454-
required Directory repoDir,
447+
super.processManager,
448+
required super.baseGitRef,
449+
required super.repoDir,
455450
required Directory srcDir,
456-
bool allFiles = false,
457-
MessageCallback? messageCallback,
451+
super.allFiles,
452+
super.messageCallback,
458453
}) : super(
459-
processManager: processManager,
460-
baseGitRef: baseGitRef,
461-
repoDir: repoDir,
462454
srcDir: srcDir,
463-
allFiles: allFiles,
464-
messageCallback: messageCallback,
465455
) {
466456
googleJavaFormatJar = File(
467457
path.absolute(
@@ -596,19 +586,14 @@ class JavaFormatChecker extends FormatChecker {
596586
/// Checks the format of any BUILD.gn files using the "gn format" command.
597587
class GnFormatChecker extends FormatChecker {
598588
GnFormatChecker({
599-
ProcessManager processManager = const LocalProcessManager(),
600-
required String baseGitRef,
589+
super.processManager,
590+
required super.baseGitRef,
601591
required Directory repoDir,
602-
required Directory srcDir,
603-
bool allFiles = false,
604-
MessageCallback? messageCallback,
592+
required super.srcDir,
593+
super.allFiles,
594+
super.messageCallback,
605595
}) : super(
606-
processManager: processManager,
607-
baseGitRef: baseGitRef,
608596
repoDir: repoDir,
609-
srcDir: srcDir,
610-
allFiles: allFiles,
611-
messageCallback: messageCallback,
612597
) {
613598
gnBinary = File(
614599
path.join(
@@ -687,19 +672,14 @@ class GnFormatChecker extends FormatChecker {
687672
/// Checks the format of any .py files using the "yapf" command.
688673
class PythonFormatChecker extends FormatChecker {
689674
PythonFormatChecker({
690-
ProcessManager processManager = const LocalProcessManager(),
691-
required String baseGitRef,
675+
super.processManager,
676+
required super.baseGitRef,
692677
required Directory repoDir,
693-
required Directory srcDir,
694-
bool allFiles = false,
695-
MessageCallback? messageCallback,
678+
required super.srcDir,
679+
super.allFiles,
680+
super.messageCallback,
696681
}) : super(
697-
processManager: processManager,
698-
baseGitRef: baseGitRef,
699682
repoDir: repoDir,
700-
srcDir: srcDir,
701-
allFiles: allFiles,
702-
messageCallback: messageCallback,
703683
) {
704684
yapfBin = File(path.join(
705685
repoDir.absolute.path,
@@ -787,20 +767,13 @@ class _GrepResult {
787767
/// Checks for trailing whitspace in Dart files.
788768
class WhitespaceFormatChecker extends FormatChecker {
789769
WhitespaceFormatChecker({
790-
ProcessManager processManager = const LocalProcessManager(),
791-
required String baseGitRef,
792-
required Directory repoDir,
793-
required Directory srcDir,
794-
bool allFiles = false,
795-
MessageCallback? messageCallback,
796-
}) : super(
797-
processManager: processManager,
798-
baseGitRef: baseGitRef,
799-
repoDir: repoDir,
800-
srcDir: srcDir,
801-
allFiles: allFiles,
802-
messageCallback: messageCallback,
803-
);
770+
super.processManager,
771+
required super.baseGitRef,
772+
required super.repoDir,
773+
required super.srcDir,
774+
super.allFiles,
775+
super.messageCallback,
776+
});
804777

805778
@override
806779
Future<bool> checkFormatting() async {

ci/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name: ci_scripts
66
publish_to: none
77
environment:
8-
sdk: '>=2.12.0-0 <3.0.0'
8+
sdk: '>=3.0.0-0 <4.0.0'
99

1010
# Do not add any dependencies that require more than what is provided in
1111
# //third_party/pkg, //third_party/dart/pkg, or

flutter_frontend_server/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ homepage: https://flutter.dev
1818
# relative to this directory into //third_party/dart
1919

2020
environment:
21-
sdk: ">=2.12.0 <3.0.0"
21+
sdk: '>=3.0.0-0 <4.0.0'
2222

2323
dependencies:
2424
args: any

impeller/tessellator/dart/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ publish_to: none
88
homepage: https://github.com/flutter/impeller/tree/main/tessellator/dart
99

1010
environment:
11-
sdk: '>=2.12.0 <3.0.0'
11+
sdk: '>=3.0.0-0 <4.0.0'

lib/snapshot/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# This file is needed by Fuchsia's dart_library template.
66

77
environment:
8-
sdk: '>=2.12.0 <3.0.0'
8+
sdk: '>=3.0.0-0 <4.0.0'

lib/web_ui/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publish_to: none
33

44
# Keep the SDK version range in sync with pubspecs under web_sdk
55
environment:
6-
sdk: ">=2.19.0 <3.0.0"
6+
sdk: '>=2.19.0 <4.0.0'
77

88
dependencies:
99
js: 0.6.4

shell/platform/fuchsia/dart-pkg/fuchsia/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# found in the LICENSE file.
44

55
environment:
6-
sdk: '>=2.12.0 <3.0.0'
6+
sdk: '>=3.0.0-0 <4.0.0'

shell/platform/fuchsia/dart-pkg/zircon/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name: zircon
66

77
environment:
8-
sdk: '>=2.12.0 <3.0.0'
8+
sdk: '>=3.0.0-0 <4.0.0'
99

1010

1111
# Uncomment block for local testing

shell/platform/fuchsia/dart-pkg/zircon_ffi/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: zircon_ffi
22

33
environment:
4-
sdk: '>=2.12.0 <3.0.0'
4+
sdk: '>=3.0.0-0 <4.0.0'
55

66
dependencies:
77
ffi: ^1.0.0

shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
# template in BUILD.gn.
77

88
environment:
9-
sdk: '>=2.12.0 <3.0.0'
9+
sdk: '>=3.0.0-0 <4.0.0'
1010

0 commit comments

Comments
 (0)