Merge branch 'master' into master

Author: okorohelijah

.ci.yaml

@@ -48,9 +48,9 @@ body:
         please include the output of running them with `--verbose`; for example,
         the output of running `flutter --verbose create foo`.
 
-        If the logs are too large to be uploaded to Github, you may upload
-        them as a `txt` file or use online tools like https://pastebin.com to
-        share it.
+        If the logs are too large to be uploaded to GitHub, you may upload
+        them as a `.txt` file or use online tools like [Pastebin](https://pastebin.com)
+        to share them.
 
         Note: Please do not upload screenshots of text. Instead, use code blocks
         or the above mentioned ways to upload logs.

.github/ISSUE_TEMPLATE/01_activation.yml

@@ -0,0 +1,66 @@
+# Copyright 2024 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+name: Remove outdated CICD Label
+
+on:
+  pull_request_target:
+    types: [synchronize]
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  remove_cicd_label:
+    name: remove_cicd_label
+    if: contains(github.event.pull_request.labels.*.name, 'CICD')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if label was added before push
+        id: check_timing
+        run: |
+          # Get push time (commit date of the head SHA)
+          PUSH_TIME='${{ github.event.pull_request.updated_at }}'
+          echo "Push time: $PUSH_TIME"
+
+          # Get latest CICD labeling event time from the last 100 events
+          LABEL_TIME=$(gh api graphql -f query='
+            query($owner: String!, $repo: String!, $pr: Int!) {
+              repository(owner: $owner, name: $repo) {
+                pullRequest(number: $pr) {
+                  timelineItems(last: 100, itemTypes: [LABELED_EVENT]) {
+                    nodes {
+                      ... on LabeledEvent {
+                        label { name }
+                        createdAt
+                      }
+                    }
+                  }
+                }
+              }
+            }' -f owner=${{ github.repository_owner }} -f repo=${{ github.event.repository.name }} -F pr=${{ github.event.pull_request.number }} \
+            --jq '.data.repository.pullRequest.timelineItems.nodes | map(select(.label.name == "CICD")) | last | .createdAt')
+          echo "Label time: $LABEL_TIME"
+
+          if [[ -z "$LABEL_TIME" ]]; then
+            # Label exists on PR (checked by job 'if') but not in last 100 events -> must be very old
+            echo "should_remove=true" >> "$GITHUB_OUTPUT"
+            echo "Result: Label found on PR but not in recent timeline events. Assuming it is old."
+          elif [[ "$LABEL_TIME" < "$PUSH_TIME" ]]; then
+            echo "should_remove=true" >> "$GITHUB_OUTPUT"
+            echo "Result: Label added at $LABEL_TIME is older than push at $PUSH_TIME. Removing."
+          else
+            echo "should_remove=false" >> "$GITHUB_OUTPUT"
+            echo "Result: Label added at $LABEL_TIME is newer than or same as push at $PUSH_TIME. Skipping removal."
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Remove outdated CICD label
+        if: steps.check_timing.outputs.should_remove == 'true'
+        run: |
+          gh pr edit ${{ github.event.pull_request.number }} -R ${{ github.repository }} --remove-label "CICD"
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/cicd.yml

@@ -31,18 +31,10 @@ jobs:
 
       # avoid downloading hundreds of other branches/history
       # utilizing `fetch-depth:0` in actions/checkout would clone everything.
-      - name: Fetch Stable Branch Only
-        run: git fetch upstream stable:stable --depth=1
-
-      - name: Read CHANGELOG.md from the stable branch
-        id: read_stable_changelog
+      - name: Fetch upstream branches
         run: |
-          # upstream/stable is locally mapped to stable
-          # use the local stable ref from above
-          CHANGELOG_CONTENT=$(git show stable:CHANGELOG.md)
-          echo "CHANGELOG_CONTENT<<EOF" >> $GITHUB_ENV
-          echo "$CHANGELOG_CONTENT" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
+          git fetch upstream stable:stable --depth=1
+          git fetch upstream master --depth=1
 
       - name: Prepare PR branch and commit changes
         id: prepare_pr_branch
@@ -51,13 +43,27 @@ jobs:
         run: |
           PR_BRANCH="sync-changelog-stable-to-master-$(date +%s)"
           echo "pr_branch_name=$PR_BRANCH" >> "$GITHUB_OUTPUT"
-          git checkout -b "$PR_BRANCH" master
-          echo "${{ env.CHANGELOG_CONTENT }}" > CHANGELOG.md
+
+          # Base the branch on upstream's master to avoid issues if the fork's master is out of date
+          git checkout -b "$PR_BRANCH" upstream/master
+
+          # Retrieve the file from stable directly into the working directory
+          git show stable:CHANGELOG.md > CHANGELOG.md
+
+          # Stop if no changes are detected
+          if git diff --quiet CHANGELOG.md; then
+            echo "No changes detected. Skipping PR creation."
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          echo "has_changes=true" >> "$GITHUB_OUTPUT"
           git add CHANGELOG.md
           git commit -m "Sync CHANGELOG.md from stable"
           git push origin "$PR_BRANCH"
 
       - name: Create Pull Request
+        if: steps.prepare_pr_branch.outputs.has_changes == 'true'
         env:
           GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
         run: |

.github/workflows/merge-changelog.yml

@@ -137,6 +137,11 @@ Mairon Slusarz <maironlucaslusarz@gmail.com>
 Ricardo Dalarme <ricardodalarme@outlook.com>
 yiiim <ybz975218925@live.com>
 letrungdo <letrdo@gmail.com>
-Michal Kucharski <michal.kucharski17@gmail.com>
 Patrick Billingsley <prbillingsley89@gmail.com>
+LeanCode <contribution@leancode.pl>
+Damian Cudzik <cudzikdam@gmail.com>
+Piotr Maszota <pmaszota98@gmail.com>
+Kamil Kras <vemu.kkras@gmail.com>
+Piotr Rogulski <piter.rogulski@gmail.com>
+Michal Kucharski <michal.kucharski17@gmail.com>
 Alexander Dmitriev <veselblu@yandex.ru>

AUTHORS

@@ -32,6 +32,14 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
 
 ## Flutter 3.41 Changes
 
+### [3.41.6](https://github.com/flutter/flutter/releases/tag/3.41.6)
+- [flutter/184025](https://github.com/flutter/flutter/pull/184025) Include a fix from Skia that ensures that the correct atlas for the glyph mask format is used consistently.
+- [flutter/182708](https://github.com/flutter/flutter/issues/182708) Visual issues with circles appearing jagged. Especially on thin stroked circles and circles with small radii.
+- [flutter/183887](https://github.com/flutter/flutter/issues/183887) During SCREEN_OFF event a deadlock preventing new frames causing an ANR can occur on android devices running the Android 16 March Security update.
+
+### [3.41.5](https://github.com/flutter/flutter/releases/tag/3.41.5)
+- [flutter/182708](https://github.com/flutter/flutter/issues/182708) When using Impeller on any platform, bur artifacts in circles rendering at 45 degree angles.
+
 ### [3.41.4](https://github.com/flutter/flutter/releases/tag/3.41.4)
 - [flutter/182748](https://github.com/flutter/flutter/issues/182748) When building for an iOS simulator with Xcode 26, the build will fail when there is a CocoaPod dependency that does not support arm.
 - [flutter/182361](https://github.com/flutter/flutter/issues/182361) When iOS plugins register to receive lifecycle events during an event, a crash may occur.

CHANGELOG.md

@@ -31,22 +31,22 @@
 /engine/src/flutter/shell/platform/darwin/common/ @flutter/ios-reviewers
 /engine/src/flutter/shell/platform/darwin/ios/framework/ @flutter/ios-reviewers
 /packages/flutter_tools/**/ios/* @flutter/ios-reviewers
-/packages/flutter_tools/**/macos/* @flutter/ios-reviewers
 /packages/flutter_tools/**/*xcode* @flutter/ios-reviewers
 /packages/flutter_tools/**/*ios* @flutter/ios-reviewers
-/packages/flutter_tools/**/*macos* @flutter/ios-reviewers
+
+# macOS team - keep this synced with .github/labeler.yml's team-macos section.
+/engine/src/flutter/src/flutter/shell/platform/darwin/common/**/* @flutter/macos-reviewers
+/engine/src/flutter/shell/platform/darwin/macos/**/* @flutter/macos-reviewers
+
+# Shared with iOS and macOS teams - keep this synced with both .github/labeler.yml's team-ios and team-macos sections.
+/packages/flutter_tools/**/macos/* @flutter/macos-reviewers @flutter/ios-reviewers
+/packages/flutter_tools/**/*macos* @flutter/ios-reviewers @flutter/macos-reviewers
 
 # Linux team - keep this synced with .github/labeler.yml's team-linux section.
 /engine/src/flutter/shell/platform/linux/**/* @flutter/linux-reviewers
 /packages/flutter_tools/**/linux/* @flutter/linux-reviewers
 /packages/flutter_tools/**/*linux* @flutter/linux-reviewers
 
-# macOS team - keep this synced with .github/labeler.yml's team-macos section.
-/engine/src/flutter/src/flutter/shell/platform/darwin/common/**/* @flutter/macos-reviewers
-/engine/src/flutter/shell/platform/darwin/macos/**/* @flutter/macos-reviewers
-/packages/flutter_tools/**/macos/* @flutter/macos-reviewers
-/packages/flutter_tools/**/*macos* @flutter/macos-reviewers
-
 # Windows team - keep this synced with .github/labeler.yml's team-windows section.
 /engine/src/flutter/shell/platform/windows/**/* @flutter/windows-reviewers
 /packages/flutter_tools/**/windows/* @flutter/windows-reviewers

CODEOWNERS

@@ -156,6 +156,35 @@ incomplete patch from the list of [issues with partial patches][has-partial-patc
 
 [has-partial-patch]: https://github.com/flutter/flutter/labels/has%20partial%20patch
 
+
+Reviewing Code
+--------------
+
+Reviewing code is just as valuable as writing it. It is one of the fastest ways
+to learn the codebase and help the team move faster. We welcome reviews from
+everyone, regardless of whether you have commit access.
+
+### The Reviewer Path
+
+Anyone can provide review feedback on a change, and doing so is an excellent way
+to learn the codebase.
+
+While reviews are welcome from the entire community, currently only members of
+the `flutter-hackers` group can grant the final approval required for a change
+to land. Consistently providing helpful code reviews is a valid and highly
+encouraged path to joining this group.
+
+For more information on how to earn commit access, please read the
+[Contributor access guide](./docs/contributing/Contributor-access.md).
+
+### How to Review
+
+If you are new to reviewing, start by:
+
+1. **[Reading the Tree Hygiene guide.](./docs/contributing/Tree-hygiene.md#how)** It contains a 10-point checklist of what we look for (CLA, tests, API design, etc.).
+2. **Leaving comments.** Even if you can't "Approve" a PR yet, pointing out a missing test or a style violation helps the author and saves the maintainers time.
+3. **Being Gracious.** Follow our mantra: Be polite, explain the why, and provide clear next steps.
+
 Outreach
 --------
 
@@ -208,4 +237,4 @@ Social events in the contributor community
 Finally, one area where you could have a lot of impact is in contributing to social interactions among the Flutter contributor community itself.
 This could take the form of organizing weekly video chats on our Discord, or planning tech talks from contributors, for example.
 If this is an area that is of interest to you, please join our [Discord](./docs/contributing/Chat.md) and ping Hixie on the #hackers
-channel!
+channel!

CONTRIBUTING.md

@@ -15,7 +15,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'a6ccaf95c6e0813f110c7daf884a459161d6de1b',
+  'skia_revision': '9beded929d5ae82b1d1b4f4b96be34c3bd867f4e',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -59,28 +59,28 @@ vars = {
   # updated revision list of existing dependencies. You will need to
   # gclient sync before and after update deps to ensure all deps are updated.
   # updated revision list of existing dependencies.
-  'dart_revision': 'b74e5b537d7108460424bc9b8c85f59388337c0d',
+  'dart_revision': 'dfd1f8af3c52a32b7749e771a4990a400478428f',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
-  'dart_ai_rev': 'a619d4bba99e736b0fbabd3e8b94b0538e013f46',
-  'dart_binaryen_rev': '204c3f88bb2e2c92b103b0cfbf4e0a4863c12c87',
-  'dart_boringssl_rev': '6a584e1d58d1fa95bc47d6c92cc9a8cb49d29635',
+  'dart_ai_rev': '325fe27f493a64ae82b39ac32a0d2de7354477cd',
+  'dart_binaryen_rev': '58de22cdfd0ccb38ce68632695c0493c587af932',
+  'dart_boringssl_rev': 'aa0acca1acf36b7fb16aa8a7b60b97d5cb01404d',
   'dart_core_rev': '1ce6453c52f498e24fe769b1eba10565a3a61c6b',
-  'dart_devtools_rev': '45869157ee784ea4cb78570a5ba41da56a528673',
+  'dart_devtools_rev': 'd99fca28d369314ce351ea1ea7daef62ba72c1a9',
   'dart_ecosystem_rev': 'b305b11424f712d174f767369739f9a11ded6a1e',
-  'dart_http_rev': '9aa867e97717dc1b80ffb4abc670b7855e0a7554',
+  'dart_http_rev': 'c2a9c4b3312a6c3c255c78fbf7ea7a52f77ff389',
   'dart_i18n_rev': 'de7e11b7cc231d8daf6e49dc12690d7339241691',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_rev': 'd5639f45b8468fba684b076b9403ccd5f2290056',
   'dart_pub_rev': '74408212b5348003381bc63f3b59274aaa23cfa3',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': '7bb6d741574135042cecc93f141d22d1e1860de5',
-  'dart_vector_math_rev': '66d590b3cbb73397ed1b8aa87b55b2251c536008',
+  'dart_tools_rev': '8f62a7792e30b4b512caa05fb84ce45a57f8d401',
+  'dart_vector_math_rev': '5e717dfe507403747276b6565d71c8b3d610111c',
   'dart_web_rev': '48b75126e511e2d3de65130f2e7aa21cca58f473',
-  'dart_webdev_rev': '5771ee58119af9835a3005a86fae4556c69d97f0',
-  'dart_webdriver_rev': '9b6e829cfe4e6ca0cff7910e2ec58ed809dbc303',
-  'dart_webkit_inspection_protocol_rev': '0f7685804d77ec02c6564d7ac1a6c8a2341c5bdf',
+  'dart_webdev_rev': '5b7299f5b85706536aeac1c9f470b869ddb39fef',
+  'dart_webdriver_rev': 'bc92e4e9612a247c4388a7b437ad4e40a5fba1fd',
+  'dart_webkit_inspection_protocol_rev': 'bb493f55cafb4118f29ebd7cdb995efeafa7f30c',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -260,7 +260,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
 
   'engine/src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '7971660ba6306a4cc8e6f872905138f59de5bc1d',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'ee5f27adc28bd3f15b2c293f726d14d2e336cbd5',
 
    'engine/src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -292,7 +292,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:45869157ee784ea4cb78570a5ba41da56a528673'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:d99fca28d369314ce351ea1ea7daef62ba72c1a9'}]},
 
   'engine/src/flutter/third_party/dart/third_party/perfetto/src':
    Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
@@ -304,10 +304,10 @@ deps = {
    Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@a6b10dcc3db33597d058cdd602c6059137550b9b',
+   Var('dart_git') + '/dart_style.git@9b302dd20b4b38979352f21cf515b44617d344ce',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@3b019e40d6365af9456bea886da0476e5b7fdff4',
+   Var('dart_git') + '/dartdoc.git@e3484b5adb4b0316667c7b07cd16ec4cfc877887',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
    Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -322,7 +322,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@c478dfede2b37000ea52ac57da7a48ab9e99f5af',
+   Var('dart_git') + '/native.git@debb5bddc4ce0aef9d70bb949495e0c65cc976d4',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -331,7 +331,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@900731b313dabf48927a82f2124e5a996c4a3d05',
+   Var('dart_git') + '/shelf.git@4d99e49fa9275bfa348a88c0ce066bfcd335f763',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
    Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -340,7 +340,7 @@ deps = {
    Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@7e6d5dac07e40241238e0951438d0c0a2750e4b9',
+   Var('dart_git') + '/test.git@2b8c256a6320435dc8c9dbb1303fb6540e617846',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -800,7 +800,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'WOfyEFkxf9JX26VS-CEIi6wixdcxGHXxM5OVAkhEMHAC'
+        'version': 'BIlBJNOlKjQeRFoFyqVps99pNQfQqxFEhTbAbqWy04MC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

DEPS

@@ -253,7 +253,9 @@
 /dev/devicelab/bin/tasks/complex_layout_macos__compile.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_macos_impeller__start_up.dart @gaaclarke @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_macos__start_up.dart @cbracken @flutter/desktop
+/dev/devicelab/bin/tasks/complex_layout_scroll_perf_macos_impeller__timeline_summary.dart @gaaclarke @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_scroll_perf_macos__timeline_summary.dart @cbracken @flutter/desktop
+/dev/devicelab/bin/tasks/new_gallery_macos_impeller__transition_perf.dart @b-luk @flutter/engine
 /dev/devicelab/bin/tasks/complex_layout_win_desktop__compile.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan-g @flutter/plugin
@@ -293,6 +295,7 @@
 /dev/devicelab/bin/tasks/platform_channel_sample_test_macos.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/platform_channel_sample_test_windows.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/platform_view_macos__start_up.dart @cbracken @flutter/desktop
+/dev/devicelab/bin/tasks/platform_view_macos_impeller__start_up.dart @loic-sharma @flutter/desktop
 /dev/devicelab/bin/tasks/platform_view_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/plugin_lint_mac.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/plugin_test_android_standard.dart @stuartmorgan-g @flutter/plugin