File tree Expand file tree Collapse file tree 2 files changed +29
-0
lines changed
engine/src/flutter/ci/tizen Expand file tree Collapse file tree 2 files changed +29
-0
lines changed Original file line number Diff line number Diff line change @@ -146,6 +146,12 @@ jobs:
146146 (Get-Content ".gclient") | ForEach-Object { $_ -replace "'flutter'","'.'" } | Set-Content ".gclient"
147147 # TODO(jsuya) : pipes deprecated in python 3.13. (https://dart-review.googlesource.com/c/sdk/+/307620)
148148 (Get-Content "engine/src/build/vs_toolchain.py") | ForEach-Object { $_ -replace 'import pipes','' } | Set-Content "engine/src/build/vs_toolchain.py"
149+
150+ # Test
151+ Copy-Item -Path "engine/src/flutter/ci/tizen/dart_version.patch" -Destination "engine/src/flutter/third_party/dart/tools"
152+ Set-Location -Path "C:\workspace\flutter\engine\src\fluttert\third_party\dart\tools"
153+ Get-Content dart_version.patch | git am
154+ Set-Location -Path "C:\workspace\flutter"
149155 gclient setdep --var=download_dart_sdk=False --var=download_android_deps=False --var=download_fuchsia_deps=False --deps-file=DEPS
150156 gclient sync -v --no-history --shallow --with_tags
151157
Original file line number Diff line number Diff line change 1+ diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
2+ index 01a7a0e9469..d24470e6824 100644
3+ --- a/tools/generate_package_config.dart
4+ +++ b/tools/generate_package_config.dart
5+ @@ -102,12 +102,11 @@ $overrides
6+ String currentSDKVersion() {
7+ final versionContents =
8+ File.fromUri(repoRoot.resolve('tools/VERSION')).readAsStringSync();
9+ - final lines = versionContents
10+ - .split('\n')
11+ - .where((line) => !line.startsWith('#') && line.isNotEmpty);
12+ - final versionParts = Map.fromEntries(lines.map((line) {
13+ - final parts = line.split(' ');
14+ - return MapEntry(parts[0], parts[1]);
15+ - }));
16+ + final lines = LineSplitter.split(versionContents);
17+ + final versionParts = {
18+ + for (var line in lines)
19+ + if (line.isNotEmpty && !line.startsWith('#'))
20+ + if (line.split(' ') case [final key, final value]) key: value
21+ + };
22+ return '${versionParts['MAJOR']}.${versionParts['MINOR']}.${versionParts['PATCH']}';
23+ }
You can’t perform that action at this time.
0 commit comments