Replace the plugin build-type copy with initWith on the public DSL

DEPS

@@ -15,7 +15,7 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
   'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
-  'skia_revision': '70988bed1b3bea0026026083ca0accd215620d53',
+  'skia_revision': '698c60bf58f175479343f07c31904b404a2b843e',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -55,12 +55,12 @@ 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': 'cb056da580b6357c87b4dbea6ae850a6d808cea6',
+  'dart_revision': '78bbc37b6ff6341346c7c8fa06e5c9c6ec91ee97',
 
   # 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': '9926156a583cec3d22d521232b31c70fa9a87dc1',
-  'dart_boringssl_rev': 'defe5810ee8be430bcdeccf46a199bec0e93abdb',
+  'dart_boringssl_rev': 'da182b2afcea3677f726e708ac5e53eea6760781',
   'dart_core_rev': '773de9d6321bc2c7d86d6926e30b341f0b8c2cb1',
   'dart_devtools_rev': '21f1838f3a9b138ac377efb953ca5a53c8832e75',
   'dart_ecosystem_rev': 'cda8bd535dfbcff45010bc3c843d325682f944b2',
@@ -70,7 +70,7 @@ vars = {
   'dart_protobuf_rev': '91efb90f437bb6a30e6726c3369a2fcb9bba06e7',
   'dart_pub_rev': '7654d523a42e764fad77c9e7b63a9686b88c9323',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': 'a4b459cca3ab39466bf8fe6734622b92015b5e15',
+  'dart_tools_rev': '7dc3279da2d7b6bdd49164cada8531d6a2125c15',
   'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
   'dart_web_rev': '6b84f811cd67a5fd05f4dac24cb56542bcfc92e4',
   'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
@@ -199,7 +199,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': 'KaOq3EE4qJ9fnaaaKznmHAZs9wyn-LdK_h52KEQv2KgC',
+  'fuchsia_test_scripts_version': '0iCv10IlKfiilEBOU6W-UM1oPJ8_wGduU0i6cYYDo28C',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -292,7 +292,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
 
   'engine/src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd578f2e8b7bd5938e21cfb6bf15c079e0aa5b738',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '8cc91d9b6ab9991802fd208ee03a69714fd0251c',
 
    'engine/src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -336,7 +336,7 @@ 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@dfdf6420c7ea923d28edef3f11e89b4ff23d03bf',
+   Var('dart_git') + '/dart_style.git@39edc2d946a5d7bd1caf6f1695f366b00f7b873c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@27376696f59b8776af3a2d07291a53562767d345',
@@ -354,7 +354,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@d196dea41ad2a901a6734066e2c73002a02f9fd5',
+   Var('dart_git') + '/native.git@057ba8856b8ed2135c549a27719884fd9c7f2ed1',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -830,7 +830,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'GCQlmt6h-esJsNubSmgdOPOVSJoeftcg9q5Bmq8H51AC'
+        'version': '8Xu4ujBJniC0nQGx3MAlb2ANTQhaU6CrIcmBlf-yz0gC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

bin/internal/flutter_packages.version

@@ -1 +1 @@
-1785501174f39c234ec99d9fc2da503eb9fbfc7b
+df2ba94faea6a88a7c749c1d3116d9dc232c3ac8

bin/internal/update_dart_sdk.ps1

@@ -70,20 +70,11 @@ if ($env:FLUTTER_HOST_ARCH -eq "arm64") {
 }
 $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName"
 
-if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) {
-    # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ).
-    $oldDartSdkSuffix = 1
-    while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ }
-
-    if (Test-Path $dartSdkPath) {
-        Rename-Item $dartSdkPath "$oldDartSdkPrefix$oldDartSdkSuffix"
-    }
-
-    if (Test-Path $dartSdkLicense) {
-        Rename-Item $dartSdkLicense "$oldDartSdkPrefix$oldDartSdkSuffix.LICENSE.md"
-    }
+$dartSdkPathTemp = "$cachePath\dart-sdk.tmp"
+if (Test-Path $dartSdkPathTemp) {
+    Remove-Item $dartSdkPathTemp -Recurse -Force
 }
-New-Item $dartSdkPath -force -type directory | Out-Null
+New-Item $dartSdkPathTemp -force -type directory | Out-Null
 $dartSdkZip = "$cachePath\$dartZipName"
 
 Try {
@@ -106,27 +97,63 @@ Catch {
 If (Get-Command 7z -errorAction SilentlyContinue) {
     Write-Host "Expanding downloaded archive with 7z..."
     # The built-in unzippers are painfully slow. Use 7-Zip, if available.
-    & 7z x $dartSdkZip "-o$cachePath" -bd | Out-Null
+    & 7z x $dartSdkZip "-o$dartSdkPathTemp" -bd | Out-Null
 } ElseIf (Get-Command 7za -errorAction SilentlyContinue) {
     Write-Host "Expanding downloaded archive with 7za..."
     # Use 7-Zip's standalone version 7za.exe, if available.
-    & 7za x $dartSdkZip "-o$cachePath" -bd | Out-Null
+    & 7za x $dartSdkZip "-o$dartSdkPathTemp" -bd | Out-Null
 } ElseIf (Get-Command Microsoft.PowerShell.Archive\Expand-Archive -errorAction SilentlyContinue) {
     Write-Host "Expanding downloaded archive with PowerShell..."
     # Use PowerShell's built-in unzipper, if available (requires PowerShell 5+).
     $global:ProgressPreference='SilentlyContinue'
-    Microsoft.PowerShell.Archive\Expand-Archive $dartSdkZip -DestinationPath $cachePath
+    Microsoft.PowerShell.Archive\Expand-Archive $dartSdkZip -DestinationPath $dartSdkPathTemp
 } Else {
     Write-Host "Expanding downloaded archive with Windows..."
     # As last resort: fall back to the Windows GUI.
     $shell = New-Object -com shell.application
     $zip = $shell.NameSpace($dartSdkZip)
     foreach($item in $zip.items()) {
-        $shell.Namespace($cachePath).copyhere($item)
+        $shell.Namespace($dartSdkPathTemp).copyhere($item)
     }
 }
 
 Remove-Item $dartSdkZip
+
+if (-not (Test-Path "$dartSdkPathTemp\dart-sdk")) {
+    Remove-Item $dartSdkPathTemp -Recurse -Force -ErrorAction SilentlyContinue
+    Write-Error "Dart SDK extraction failed: '$dartSdkPathTemp\dart-sdk' not found."
+    exit 1
+}
+
+# Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ).
+if ((Test-Path $dartSdkPath) -or (Test-Path $dartSdkLicense)) {
+    $oldDartSdkSuffix = 1
+    while (Test-Path "$cachePath\$oldDartSdkPrefix$oldDartSdkSuffix") { $oldDartSdkSuffix++ }
+
+    if (Test-Path $dartSdkPath) {
+        Rename-Item $dartSdkPath "$oldDartSdkPrefix$oldDartSdkSuffix" -ErrorAction Stop
+    }
+
+    if (Test-Path $dartSdkLicense) {
+        Rename-Item $dartSdkLicense "$oldDartSdkPrefix$oldDartSdkSuffix.LICENSE.md" -ErrorAction Stop
+    }
+}
+
+# The unzip might have extracted LICENSE.dart_sdk_archive.md to the temp dir
+$tempLicense = "$dartSdkPathTemp\LICENSE.dart_sdk_archive.md"
+if (Test-Path $tempLicense) {
+    if (Test-Path $dartSdkLicense) {
+        Remove-Item $dartSdkLicense -Force -ErrorAction Stop
+    }
+    Move-Item $tempLicense $dartSdkLicense -ErrorAction Stop
+}
+
+# Move the extracted SDK to the final location
+try {
+    Move-Item "$dartSdkPathTemp\dart-sdk" $dartSdkPath -ErrorAction Stop
+} finally {
+    Remove-Item $dartSdkPathTemp -Recurse -Force -ErrorAction SilentlyContinue
+}
 $engineVersion | Out-File $engineStamp -Encoding ASCII
 
 # Try to delete all old SDKs and license files.

bin/internal/update_dart_sdk.sh

@@ -133,15 +133,11 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != "$(< "$ENGINE_STAMP")" ];
   DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}${ENGINE_REALM:+/$ENGINE_REALM}"
   DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME"
 
-  # if the sdk path exists, copy it to a temporary location
-  if [ -d "$DART_SDK_PATH" ]; then
-    rm -rf "$DART_SDK_PATH_OLD"
-    mv "$DART_SDK_PATH" "$DART_SDK_PATH_OLD"
-  fi
+  # Create a temporary directory for extraction to ensure atomicity
+  DART_SDK_PATH_TEMP="$FLUTTER_ROOT/bin/cache/dart-sdk.tmp"
+  rm -rf -- "$DART_SDK_PATH_TEMP"
+  mkdir -m 755 -p -- "$DART_SDK_PATH_TEMP"
 
-  # install the new sdk
-  rm -rf -- "$DART_SDK_PATH"
-  mkdir -m 755 -p -- "$DART_SDK_PATH"
   DART_SDK_ZIP="$FLUTTER_ROOT/bin/cache/$DART_ZIP_NAME"
 
   # Conditionally set verbose flag for LUCI
@@ -172,20 +168,49 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != "$(< "$ENGINE_STAMP")" ];
     >&2 echo "  https://flutter.dev/community/china"
     >&2 echo
     rm -f -- "$DART_SDK_ZIP"
+    rm -rf -- "$DART_SDK_PATH_TEMP"
     exit 1
   }
-  unzip -o -q "$DART_SDK_ZIP" -d "$FLUTTER_ROOT/bin/cache" || {
+  unzip -o -q "$DART_SDK_ZIP" -d "$DART_SDK_PATH_TEMP" || {
     >&2 echo
     >&2 echo "It appears that the downloaded file is corrupt; please try again."
     >&2 echo "If this problem persists, please report the problem at:"
     >&2 echo "  https://github.com/flutter/flutter/issues/new?template=01_activation.yml"
     >&2 echo
     rm -f -- "$DART_SDK_ZIP"
+    rm -rf -- "$DART_SDK_PATH_TEMP"
     exit 1
   }
   rm -f -- "$DART_SDK_ZIP"
-  $FIND "$DART_SDK_PATH" -type d -exec chmod 755 {} +
-  $FIND "$DART_SDK_PATH" -type f $IS_USER_EXECUTABLE -exec chmod a+x,a+r {} +
+
+  if [ ! -d "$DART_SDK_PATH_TEMP/dart-sdk" ]; then
+    >&2 echo "Dart SDK extraction failed: '$DART_SDK_PATH_TEMP/dart-sdk' not found."
+    rm -rf -- "$DART_SDK_PATH_TEMP"
+    exit 1
+  fi
+
+  # The unzip might have extracted LICENSE.dart_sdk_archive.md to the temp dir
+  if [ -f "$DART_SDK_PATH_TEMP/LICENSE.dart_sdk_archive.md" ]; then
+    mv "$DART_SDK_PATH_TEMP/LICENSE.dart_sdk_archive.md" "$FLUTTER_ROOT/bin/cache/LICENSE.dart_sdk_archive.md"
+  fi
+
+  $FIND "$DART_SDK_PATH_TEMP/dart-sdk" -type d -exec chmod 755 {} +
+  $FIND "$DART_SDK_PATH_TEMP/dart-sdk" -type f $IS_USER_EXECUTABLE -exec chmod a+x,a+r {} +
+
+  # Move old SDK to a temporary location in case it is still in use (e.g. by an IDE).
+  if [ -d "$DART_SDK_PATH" ]; then
+    rm -rf "$DART_SDK_PATH_OLD"
+    mv "$DART_SDK_PATH" "$DART_SDK_PATH_OLD"
+  fi
+
+  # Move the extracted SDK to the final location
+  mv "$DART_SDK_PATH_TEMP/dart-sdk" "$DART_SDK_PATH" || {
+    >&2 echo "Failed to move Dart SDK to final destination."
+    rm -rf -- "$DART_SDK_PATH_TEMP"
+    exit 1
+  }
+  rm -rf -- "$DART_SDK_PATH_TEMP"
+
   echo "$ENGINE_VERSION" > "$ENGINE_STAMP"
 
   # delete any temporary sdk path

dev/devicelab/lib/framework/fs_safety.dart

@@ -37,16 +37,42 @@ bool _isDangerousDirectory(String dirPath) {
   return false;
 }
 
+/// Canonicalizes [p] and normalizes standard root symlink aliases on macOS.
+///
+/// On macOS (Darwin), system root directories `/var`, `/tmp`, and `/etc` are
+/// symlinks to `/private/var`, `/private/tmp`, and `/private/etc` respectively
+/// (with Darwin per-user `$TMPDIR` located under `/var/folders/...`).
+///
+/// Normalizing these prefixes at the string level ensures consistent prefix
+/// matching against the resolved temporary directory without performing costly
+/// filesystem syscalls (`resolveSymbolicLinksSync`) or failing when validating
+/// paths to files/directories that do not exist yet.
+String _canonicalize(String p) {
+  final String canonical = path.canonicalize(p);
+  if (io.Platform.isMacOS) {
+    if (canonical.startsWith('/var/') || canonical == '/var') {
+      return '/private$canonical';
+    }
+    if (canonical.startsWith('/tmp/') || canonical == '/tmp') {
+      return '/private$canonical';
+    }
+    if (canonical.startsWith('/etc/') || canonical == '/etc') {
+      return '/private$canonical';
+    }
+  }
+  return canonical;
+}
+
 bool _isAllowedPath(String entityPath) {
-  final String canonicalEntity = path.canonicalize(entityPath);
+  final String canonicalEntity = _canonicalize(entityPath);
 
   // Allow system temp
   String canonicalTemp;
   final io.IOOverrides? currentOverrides = io.IOOverrides.current;
   if (currentOverrides is FSGuardIOOverrides) {
     canonicalTemp = currentOverrides._canonicalSystemTemp;
   } else {
-    canonicalTemp = path.canonicalize(io.Directory.systemTemp.path);
+    canonicalTemp = _canonicalize(io.Directory.systemTemp.path);
   }
 
   if (path.isWithin(canonicalTemp, canonicalEntity) || canonicalEntity == canonicalTemp) {
@@ -578,9 +604,9 @@ final class FSGuardIOOverrides extends io.IOOverrides {
         ? _parent.getSystemTempDirectory()
         : super.getSystemTempDirectory();
     try {
-      return path.canonicalize(rawTemp.resolveSymbolicLinksSync());
+      return _canonicalize(rawTemp.resolveSymbolicLinksSync());
     } on Object catch (_) {
-      return path.canonicalize(rawTemp.path);
+      return _canonicalize(rawTemp.path);
     }
   }();
 

dev/integration_tests/data_asset_app/pubspec.yaml

@@ -12,7 +12,7 @@ resolution: workspace
 dependencies:
   flutter:
     sdk: flutter
-  hooks: ^2.1.0
+  hooks: ^2.2.0
   data_assets: ^0.20.0
   data_asset_package:
     path: ../data_asset_package
@@ -24,4 +24,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: qa7aie
+# PUBSPEC CHECKSUM: g7de17

dev/integration_tests/data_asset_package/pubspec.yaml

@@ -12,7 +12,7 @@ resolution: workspace
 dependencies:
   flutter:
     sdk: flutter
-  hooks: ^2.1.0
+  hooks: ^2.2.0
   data_assets: ^0.20.0
 
 dev_dependencies:
@@ -22,4 +22,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: fqqee1
+# PUBSPEC CHECKSUM: qo17ak

dev/integration_tests/hook_user_defines/pubspec.yaml

@@ -15,11 +15,11 @@ hooks:
       magic_value: 1000
 
 dependencies:
-  hooks: 2.1.0
+  hooks: 2.2.0
   logging: 1.3.0
-  native_toolchain_c: 0.19.3
+  native_toolchain_c: 0.19.4
 
 dev_dependencies:
   test: 1.29.0
 
-# PUBSPEC CHECKSUM: b3eo7f
+# PUBSPEC CHECKSUM: hsfmta

dev/integration_tests/new_gallery/lib/data/gallery_options.dart

@@ -143,6 +143,12 @@ class GalleryOptions {
     isTestMode,
   );
 
+  static GalleryOptions? maybeOf(BuildContext context) {
+    final _ModelBindingScope? scope = context
+        .dependOnInheritedWidgetOfExactType<_ModelBindingScope>();
+    return scope?.modelBindingState.currentModel;
+  }
+
   static GalleryOptions of(BuildContext context) {
     final _ModelBindingScope scope = context
         .dependOnInheritedWidgetOfExactType<_ModelBindingScope>()!;

dev/integration_tests/new_gallery/lib/layout/adaptive.dart

@@ -5,6 +5,8 @@
 import 'package:adaptive_breakpoints/adaptive_breakpoints.dart';
 import 'package:flutter/material.dart';
 
+import '../data/gallery_options.dart';
+
 /// The maximum width taken up by each item on the home screen.
 const double maxHomeItemWidth = 1400.0;
 
@@ -15,11 +17,19 @@ const double maxHomeItemWidth = 1400.0;
 /// where only part of the display is available to said widgets.
 ///
 /// Used to build adaptive and responsive layouts.
-bool isDisplayDesktop(BuildContext context) => getWindowType(context) >= AdaptiveWindowType.medium;
+bool isDisplayDesktop(BuildContext context) {
+  if (GalleryOptions.maybeOf(context)?.isTestMode ?? false) {
+    return false;
+  }
+  return getWindowType(context) >= AdaptiveWindowType.medium;
+}
 
 /// Returns boolean value whether the window is considered medium size.
 ///
 /// Used to build adaptive and responsive layouts.
 bool isDisplaySmallDesktop(BuildContext context) {
+  if (GalleryOptions.maybeOf(context)?.isTestMode ?? false) {
+    return false;
+  }
   return getWindowType(context) == AdaptiveWindowType.medium;
 }