Merge branch 'master' into foundation

Author: mattkae

.ci.yaml

@@ -252,6 +252,10 @@ platform_properties:
       os: Mac-13|Mac-14
       cpu: x86
       device_type: "mokey"
+      $flutter/osx_sdk : >-
+        {
+          "skip_xcode_install": true
+        }
   mac_arm64_mokey:
     properties:
       dependencies: >-
@@ -262,6 +266,10 @@ platform_properties:
       os: Mac-13|Mac-14
       cpu: arm64
       device_type: "mokey"
+      $flutter/osx_sdk : >-
+        {
+          "skip_xcode_install": true
+        }
 
   mac_pixel_7pro:
     properties:
@@ -553,6 +561,9 @@ targets:
     recipe: infra/ci_yaml
     presubmit: false
     timeout: 30
+    enabled_branches:
+      # Don't run this on release branches
+      - master
     properties:
       tags: >
         ["framework", "hostonly", "shard", "linux"]
@@ -1157,6 +1168,7 @@ targets:
       task_name: android_release_builds_exclude_dev_dependencies_test
     runIf:
       - dev/**
+      - packages/flutter_tools/**
       - bin/**
       - .ci.yaml
       - engine/**
@@ -3215,7 +3227,6 @@ targets:
   - name: Linux_pixel_7pro platform_views_hcpp_scroll_perf__timeline_summary
     recipe: devicelab/devicelab_drone
     presubmit: false
-    bringup: true
     timeout: 60
     properties:
       tags: >
@@ -3559,7 +3570,6 @@ targets:
       task_name: animated_complex_opacity_perf_macos__e2e_summary
 
   - name: Mac_benchmark basic_material_app_macos__compile
-    bringup: true # Flaky https://github.com/flutter/flutter/issues/162364
     presubmit: false
     recipe: devicelab/devicelab_drone
     timeout: 60
@@ -3864,7 +3874,6 @@ targets:
       - dev/bots/**
 
   - name: Mac_benchmark flutter_view_macos__start_up
-    bringup: true # Flaky https://github.com/flutter/flutter/issues/159540
     presubmit: false
     recipe: devicelab/devicelab_drone
     timeout: 60
@@ -6686,7 +6695,6 @@ targets:
 
   # windows mokey test
   - name: Windows_mokey native_assets_android
-    bringup: true # Flaky https://github.com/flutter/flutter/issues/156063
     recipe: devicelab/devicelab_drone
     presubmit: false
     timeout: 60

.github/ISSUE_TEMPLATE/g3_bug.yml

@@ -74,10 +74,10 @@ unlinked_spec.ds
 **/android/captures/
 **/android/gradlew
 **/android/gradlew.bat
-**/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
 *.jks
+local.properties
 
 # iOS/XCode related
 **/ios/**/*.mode1v3

.gitignore

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '6da10829d017e7ff3d103b79e0951f693b20f7da',
+  'skia_revision': '3ce6f25dc13ebce3e6e92e152c6cc05b45ad3405',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,20 +56,21 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '2cecb16348e4778844660d5e7d16a96efe3706ec',
+  'dart_revision': 'aea6fff33f063f2adc7470773f9b7f14d0caddc9',
 
   # 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_binaryen_rev': '3f6831c0bd147ae1ae0ab1d9187d37bce7cca38b',
-  'dart_boringssl_rev': '8c6b0c04f19f5a6a13af3e29a6a4bb6784cb2bd7',
+  'dart_boringssl_rev': '0c59e9e55bdaadadf49f3c092b097e72cd4b39cc',
   'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae',
   'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d',
   'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0',
+  'dart_i18n_rev': '06a664f7beaab1f8eaf82a60b722982c03c8657c',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': '610943a3bed70c1c2079af5fca02462df10d223f',
-  'dart_pub_rev': '710265bae23ad5860f33287fba10b5c369f19a93',
+  'dart_pub_rev': '639536aa78f7382b4a948669bfdc283f830b2ae9',
   'dart_tools_rev': 'b51f39d01f5a4af33428a0189cd62595c01e23de',
   'dart_web_rev': 'c2d5f63e9ea4c1409d6e159fc7b92dbcf4dc0d4d',
   'dart_webdev_rev': '718c39c3b10f6e77f767d70d1f30f8a6c8262d6f',
@@ -158,14 +159,12 @@ vars = {
   "upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git",
   "upstream_gcloud": "https://github.com/dart-lang/gcloud.git",
   "upstream_glfw": "https://github.com/glfw/glfw.git",
-  "upstream_glob": "https://github.com/dart-lang/glob.git",
   "upstream_googleapis": "https://github.com/google/googleapis.dart.git",
   "upstream_googletest": "https://github.com/google/googletest.git",
   "upstream_gtest-parallel": "https://github.com/google/gtest-parallel.git",
   "upstream_harfbuzz": "https://github.com/harfbuzz/harfbuzz.git",
   "upstream_http": "https://github.com/dart-lang/http.git",
   "upstream_icu": "https://github.com/unicode-org/icu.git",
-  "upstream_intl": "https://github.com/dart-lang/intl.git",
   "upstream_imgui": "https://github.com/ocornut/imgui.git",
   "upstream_inja": "https://github.com/pantor/inja.git",
   "upstream_json": "https://github.com/nlohmann/json.git",
@@ -177,7 +176,6 @@ vars = {
   "upstream_libtess2": "https://github.com/memononen/libtess2.git",
   "upstream_libwebp": "https://chromium.googlesource.com/webm/libwebp.git",
   "upstream_leak_tracker": "https://github.com/dart-lang/leak_tracker.git",
-  "upstream_markdown": "https://github.com/dart-lang/markdown.git",
   "upstream_mockito": "https://github.com/dart-lang/mockito.git",
   "upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
   "upstream_packages": "https://github.com/flutter/packages.git",
@@ -200,7 +198,6 @@ vars = {
   "upstream_usage": "https://github.com/dart-lang/usage.git",
   "upstream_vector_math": "https://github.com/google/vector_math.dart.git",
   "upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-  "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
   "upstream_webdev": "https://github.com/dart-lang/webdev.git",
   "upstream_webkit_inspection_protocol": "https://github.com/google/webkit_inspection_protocol.dart.git",
   "upstream_wuffs-mirror-release-c": "https://github.com/google/wuffs-mirror-release-c.git",
@@ -315,21 +312,15 @@ deps = {
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62',
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@043796be996190473b397fa2fecfa34bb91376fb',
-
   'engine/src/flutter/third_party/dart/third_party/pkg/http':
    Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/intl':
-   Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
+  'engine/src/flutter/third_party/dart/third_party/pkg/i18n':
+   Var('dart_git') + '/i18n.git' + '@' + Var('dart_i18n_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/leak_tracker':
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@62f78c64d963ba6f73bd70ed65630dc934a264e6',
-
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
    Var('dart_git') + '/native.git@c817a5e41220de370cbea6e6445e63cdc7087544',
 
@@ -354,9 +345,6 @@ deps = {
   'engine/src/flutter/third_party/dart/third_party/pkg/web':
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@f335e52affa5c70a725401394bf265fc4384e62f',
-
   'engine/src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
 

DEPS

@@ -1 +1 @@
-a9b91727371113fc453af6a1176a9aa4d0e990f9
+5498d4d2eb487afdf68af7aa1898aa3014e4b892

bin/internal/flutter_packages.version

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

dev/a11y_assessments/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true