Skip to content

Commit bf114d6

Browse files
jingshao-codejingshao-code
authored
Merge branch 'master' into fix-ios15-ocr-menu
2 parents 94fb7bc + 42553c9 commit bf114d6

File tree

224 files changed

+6036
-1460
lines changed

Some content is hidden

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

224 files changed

+6036
-1460
lines changed

‎.ci.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,7 +1761,6 @@ targets:
17611761
- name: Linux web_long_running_tests_1_5
17621762
recipe: flutter/flutter_drone
17631763
timeout: 60
1764-
bringup: true # Flaky https://github.com/flutter/flutter/issues/171025
17651764
properties:
17661765
dependencies: >-
17671766
[
@@ -1858,7 +1857,6 @@ targets:
18581857
- name: Linux web_long_running_tests_5_5
18591858
recipe: flutter/flutter_drone
18601859
timeout: 60
1861-
bringup: true # Flaky https://github.com/flutter/flutter/issues/171025
18621860
properties:
18631861
dependencies: >-
18641862
[

‎DEPS‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': 'a462e701b493d8f30b3130af3bbd4440c7946ccd',
17+
'skia_revision': 'd388ecb0ceea8f3f1efba142bc8e575680d9c11a',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,12 +56,12 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'd9edd9e7a634d535d35c5a9596470bd0406cff3b',
59+
'dart_revision': '4bd485d911a1d80a38525910b7a36f428e9b80f7',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
63-
'dart_ai_rev': '12ac0a4099baf6c9b9567ffedb2b7c368938bca4',
64-
'dart_binaryen_rev': 'b4bdcc33115b31758c56b83bb9de4642c411a042',
63+
'dart_ai_rev': '706d22444f2ca6123aeb8f1f4508b1d4451b6d0d',
64+
'dart_binaryen_rev': '8470f1b1f157201d1bc62f3202e474e7043df0ba',
6565
'dart_boringssl_rev': '035e720641f385e82c72b7b0a9e1d89e58cb5ed5',
6666
'dart_core_rev': 'b59ecf4ceebe6153e1c0166b7c9a7fdd9458a89d',
6767
'dart_devtools_rev': '53b9620798ff824f016add0fa6c25e9cc399ea0b',
@@ -74,7 +74,7 @@ vars = {
7474
'dart_protobuf_rev': '0bfff0ca150959c92dac525474d73bde946f3391',
7575
'dart_pub_rev': 'f6457fd20c9a9734a747262b1bcc2200c8357efb',
7676
'dart_sync_http_rev': 'dc54465f07d9652875deeade643256dafa2fbc6c',
77-
'dart_tools_rev': '72e6cc871a0dcb7e6b92c01a96503d1b6aebb5e3',
77+
'dart_tools_rev': '7bf22c951019f860aa52a8b7dc97fba5880aa9ba',
7878
'dart_vector_math_rev': '13f185f7e97d559e003f5ac79201da12f9a01049',
7979
'dart_web_rev': '4b2f02ebc74acef26fa1285801a626213c35b304',
8080
'dart_webdev_rev': '6dc3ddefdacf8c575d1636d77921f490ff07792d',
@@ -305,7 +305,7 @@ deps = {
305305
# WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
306306

307307
'engine/src/flutter/third_party/dart/third_party/binaryen/src':
308-
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b4bdcc33115b31758c56b83bb9de4642c411a042',
308+
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@8470f1b1f157201d1bc62f3202e474e7043df0ba',
309309

310310
'engine/src/flutter/third_party/dart/third_party/devtools':
311311
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:53b9620798ff824f016add0fa6c25e9cc399ea0b'}]},
@@ -816,7 +816,7 @@ deps = {
816816
'packages': [
817817
{
818818
'package': 'fuchsia/sdk/core/linux-amd64',
819-
'version': 'XX8LxiX10yPg8EwED3KmC-tRvwKjT85TFtnOkgB_DEkC'
819+
'version': 'lOriymW5zTP5ByH8-mX54mZhQ8gfW_me9ATMVd4zAEYC'
820820
}
821821
],
822822
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎bin/internal/content_aware_hash.ps1‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,16 @@ $flutterRoot = (Get-Item $progName).parent.parent.FullName
2626
# bin/internal/content_aware_hash.ps1: script for calculating the hash on windows
2727
# bin/internal/content_aware_hash.sh: script for calculating the hash on mac/linux
2828
# .github/workflows/content-aware-hash.yml: github action for CI/CD hashing
29-
cmd /c "git -C ""$flutterRoot"" ls-tree --format ""%(objectname) %(path)"" HEAD DEPS engine bin/internal/release-candidate-branch.version | git hash-object --stdin"
29+
#
30+
# Removing the "cmd" requirement enables powershell usage on other hosts
31+
# 1. git ls-tree | Out-String - combines output of pipeline into a single string
32+
# rather than an array for each line.
33+
# "-NoNewline" not available on PS5.1 and also removes all newlines.
34+
# 2. -replace "`r`n", "`n" - removes line endings
35+
# NOTE: Out-String adds a new line; so Out-File -NoNewline strips that.
36+
# 3. Out-File -NoNewline -Encoding ascii outputs 8bit ascii
37+
# 4. git hash-object with stdin from a pipeline consumes UTF-16, so consume
38+
#. the contents of hash.txt
39+
(git -C "$flutterRoot" ls-tree --format "%(objectname) %(path)" HEAD DEPS engine bin/internal/release-candidate-branch.version | Out-String) -replace "`r`n", "`n" | Out-File -NoNewline -Encoding ascii hash.txt
40+
git hash-object hash.txt
41+
Remove-Item hash.txt

‎bin/internal/flutter_packages.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d9d3191ea6cf5b2a040b3368171112c1da736483
1+
2c8d2bc0589c1aa957717103f0b1af4ca2e70759

‎dev/bots/analyze.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ Future<void> verifyToolTestsEndInTestDart(String workingDirectory) async {
542542

543543
// detect files that contains calls to test(), testUsingContext(), and testWithoutContext()
544544
final RegExp callsTestFunctionPattern = RegExp(
545-
r'(test\(.*\)|testUsingContext\(.*\)|testWithoutContext\(.*\))',
545+
r'^ *(test\(.*\)|testUsingContext\(.*\)|testWithoutContext\(.*\))',
546546
);
547547

548548
await for (final File file in _allFiles(toolsTestPath, 'dart', minimumMatches: 300)) {

‎dev/devicelab/bin/tasks/android_obfuscate_test.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ Future<void> main() async {
106106
return TaskResult.success(null);
107107
} on TaskResult catch (taskResult) {
108108
return taskResult;
109-
} catch (e) {
109+
} catch (e, stackTrace) {
110+
print('Task exception stack trace:\n$stackTrace');
110111
return TaskResult.failure(e.toString());
111112
}
112113
});

‎dev/devicelab/bin/tasks/android_release_builds_exclude_dev_dependencies_test.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ Future<void> main() async {
100100
return TaskResult.success(null);
101101
} on TaskResult catch (taskResult) {
102102
return taskResult;
103-
} catch (e) {
103+
} catch (e, stackTrace) {
104+
print('Task exception stack trace:\n$stackTrace');
104105
return TaskResult.failure(e.toString());
105106
}
106107
});

‎dev/devicelab/bin/tasks/build_aar_module_test.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ Future<void> main() async {
265265
return TaskResult.success(null);
266266
} on TaskResult catch (taskResult) {
267267
return taskResult;
268-
} catch (e) {
268+
} catch (e, stackTrace) {
269+
print('Task exception stack trace:\n$stackTrace');
269270
return TaskResult.failure(e.toString());
270271
} finally {
271272
rmTree(tempDir);

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,8 @@ class ModuleTest {
447447
return TaskResult.success(null);
448448
} on TaskResult catch (taskResult) {
449449
return taskResult;
450-
} catch (e) {
450+
} catch (e, stackTrace) {
451+
print('Task exception stack trace:\n$stackTrace');
451452
return TaskResult.failure(e.toString());
452453
} finally {
453454
rmTree(tempDir);

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,8 @@ class ModuleTest {
391391
return TaskResult.success(null);
392392
} on TaskResult catch (taskResult) {
393393
return taskResult;
394-
} catch (e) {
394+
} catch (e, stackTrace) {
395+
print('Task exception stack trace:\n$stackTrace');
395396
return TaskResult.failure(e.toString());
396397
} finally {
397398
rmTree(tempDir);

0 commit comments

Comments
 (0)