From 13e43f33140392098fbc59c9ba0d07cca48fb956 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Sat, 24 Aug 2024 09:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9flutter=E9=B8=BF=E8=92=99?= =?UTF-8?q?=E5=8C=96=E7=89=88=E6=9C=AC=E8=A7=A3=E6=9E=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- packages/flutter_tools/lib/src/version.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index 883eff4802..f7dd6011da 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart @@ -799,21 +799,21 @@ class GitTagVersion { static GitTagVersion parseOhosVersion(String version) { final RegExp versionPattern = RegExp( - r'^(\d+)\.(\d+)\.(\d+)(-ohos-\d+\.\d+\.\d+)?(?:-(\d+)-g([a-f0-9]+))?$'); + r'^(\d+)\.(\d+)\.(\d+)(-ohos(-\d+\.\d+\.\d+)?)?(?:-(\d+)-g([a-f0-9]+))?$'); final Match? match = versionPattern.firstMatch(version.trim()); if (match == null) { return const GitTagVersion.unknown(); } - final List matchGroups = match.groups([1, 2, 3, 4, 5, 6]); + final List matchGroups = match.groups([1, 2, 3, 4, 5, 6, 7]); final int? x = matchGroups[0] == null ? null : int.tryParse(matchGroups[0]!); final int? y = matchGroups[1] == null ? null : int.tryParse(matchGroups[1]!); final int? z = matchGroups[2] == null ? null : int.tryParse(matchGroups[2]!); final String? devString = matchGroups[3]; // count of commits past last tagged version - final int? commits = matchGroups[4] == null ? 0 : int.tryParse(matchGroups[4]!); - final String hash = matchGroups[5] ?? ''; + final int? commits = matchGroups[5] == null ? 0 : int.tryParse(matchGroups[5]!); + final String hash = matchGroups[6] ?? ''; return GitTagVersion( x: x, -- Gitee