Skip to content

Update Gradle Version Formatting Validation #10326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+40 −23
Open

Update Gradle Version Formatting Validation #10326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a65ddd3
update gradle regex format validation
jesswrd Oct 29, 2025
d754941
oops thanks gemini
jesswrd Oct 29, 2025
8bd5616
forgot format
jesswrd Oct 30, 2025
04ae84d
prepare regex for gradle 10
jesswrd Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions script/tool/lib/src/update_dependency_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,16 @@ ${response.httpResponse.body}
printError('A version must be provided to update this dependency.');
throw ToolExit(_exitNoTargetVersion);
} else if (_targetAndroidDependency == _AndroidDepdencyType.gradle) {
final RegExp validGradleVersionPattern = RegExp(r'^\d+(?:\.\d+){1,2}$');
final RegExp validGradleVersionPattern =
RegExp(r'^\d{1,2}\.\d{1,2}(?:\.\d)?$');
final bool isValidGradleVersion =
validGradleVersionPattern.stringMatch(version) == version;
if (!isValidGradleVersion) {
printError(
'A version with a valid format (maximum 2-3 numbers separated by period) must be provided.');
printError('''
A version with a valid format (maximum 2-3 numbers separated by 1-2 periods) must be provided.
1. The first number must have one or two digits
2. The second number must have one or two digits
3. If present, the third number must have a single digit''');
throw ToolExit(_exitInvalidTargetVersion);
}
} else if (_targetAndroidDependency == _AndroidDepdencyType.compileSdk ||
Expand Down
53 changes: 33 additions & 20 deletions script/tool/test/update_dependency_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,27 +608,40 @@ dev_dependencies:

group('Android dependencies', () {
group('gradle', () {
test('throws if version format is invalid', () async {
Error? commandError;
final List<String> output = await runCapturingPrint(runner, <String>[
'update-dependency',
'--android-dependency',
'gradle',
'--version',
'83',
], errorHandler: (Error e) {
commandError = e;
});
final List<String> invalidGradleVersionsFormat = <String>[
'81',
'811.1',
'8.123',
'8.12.12'
];

expect(commandError, isA<ToolExit>());
expect(
output,
containsAllInOrder(<Matcher>[
contains(
'A version with a valid format (maximum 2-3 numbers separated by period) must be provided.'),
]),
);
});
for (final String gradleVersion in invalidGradleVersionsFormat) {
test('throws because gradleVersion: $gradleVersion is invalid',
() async {
Error? commandError;
final List<String> output = await runCapturingPrint(runner, <String>[
'update-dependency',
'--android-dependency',
'gradle',
'--version',
gradleVersion,
], errorHandler: (Error e) {
commandError = e;
});

expect(commandError, isA<ToolExit>());
expect(
output,
containsAllInOrder(<Matcher>[
contains('''
A version with a valid format (maximum 2-3 numbers separated by 1-2 periods) must be provided.
1. The first number must have one or two digits
2. The second number must have one or two digits
3. If present, the third number must have a single digit'''),
]),
);
});
}

test('skips if example app does not run on Android', () async {
final RepositoryPackage package =
Expand Down