Skip to content

Commit fe3de64

Browse files
Roll Flutter from 46fb7210422d to d3dd7744e81f (33 revisions) (#11182)
Roll Flutter from 46fb7210422d to d3dd7744e81f (33 revisions) flutter/flutter@46fb721...d3dd774 2026-03-04 15619084+vashworth@users.noreply.github.com Show warning when plugins do not support SwiftPM (flutter/flutter#182506) 2026-03-04 15619084+vashworth@users.noreply.github.com Give guided message when project is not compatible with SwiftPM (flutter/flutter#182394) 2026-03-04 danny@tuppeny.com Pass --web-define through to web runner when using --machine mode (flutter/flutter#183228) 2026-03-04 104147021+MohammedTarigg@users.noreply.github.com Improve SwiftPM minimum platform mismatch diagnostics (flutter/flutter#182375) 2026-03-04 vegorov@google.com Use dart::bin::SetupDartIo to setup dart:io (flutter/flutter#176714) 2026-03-04 engine-flutter-autoroll@skia.org Roll Skia from 3197848b14ad to ada0b7628c79 (5 revisions) (flutter/flutter#183221) 2026-03-04 engine-flutter-autoroll@skia.org Roll Skia from fe9e9f22c531 to 3197848b14ad (15 revisions) (flutter/flutter#183198) 2026-03-04 34465683+rkishan516@users.noreply.github.com refactor: remove material in reorderable_list_test, scroll_notification_test, scroll_physics_test, shortcuts_test, sliver_floating_header_test, snapshot_widget_test (flutter/flutter#182698) 2026-03-04 34465683+rkishan516@users.noreply.github.com refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test (flutter/flutter#182699) 2026-03-04 737941+loic-sharma@users.noreply.github.com Add dev/benchmarks/README.md (flutter/flutter#182976) 2026-03-03 jason-simmons@users.noreply.github.com Roll RapidJSON to a branch based on the current upstream head (flutter/flutter#183048) 2026-03-03 flar@google.com [Impeller] Update comments to reflect new info about 2-pass rendering (flutter/flutter#183050) 2026-03-03 47866232+chunhtai@users.noreply.github.com Add vmservices for accessibilityEvaluation (flutter/flutter#182791) 2026-03-03 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 0dCDM2oORHwDf_pyb... to JJw5EJ87vLGqFVl4h... (flutter/flutter#183177) 2026-03-03 lukas.klingsbo@gmail.com Support mixed color spaces in `Color.lerp` (flutter/flutter#182934) 2026-03-03 36861262+QuncCccccc@users.noreply.github.com Add warning when there is a widget with color between `Material` and `ListTile` (flutter/flutter#181402) 2026-03-03 41930132+hellohuanlin@users.noreply.github.com [ios]uitest for admob banner in scrollable list gesture issue (flutter/flutter#183128) 2026-03-03 engine-flutter-autoroll@skia.org Roll Packages from faa4e22 to 9083bc9 (4 revisions) (flutter/flutter#183164) 2026-03-03 15619084+vashworth@users.noreply.github.com Build App and native asset frameworks for Add to App FlutterPluginRegistrant (flutter/flutter#183136) 2026-03-03 engine-flutter-autoroll@skia.org Roll Skia from f886711f180d to fe9e9f22c531 (4 revisions) (flutter/flutter#183155) 2026-03-03 engine-flutter-autoroll@skia.org Roll Dart SDK from e86dbe9aa742 to c597ef90d2dc (2 revisions) (flutter/flutter#183147) 2026-03-03 codefu@google.com fix: bump matcher (flutter/flutter#183167) 2026-03-02 58529443+srujzs@users.noreply.github.com Use isA to test for exceptions (flutter/flutter#183129) 2026-03-02 dpxhfxywang@163.com [two_dimensional_scrollables] Fix tableview janks when first row/column pinned (flutter/flutter#180563) 2026-03-02 victorsanniay@gmail.com Add await to callsites of BasicMessageChannel.send (flutter/flutter#182868) 2026-03-02 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#183133) 2026-03-02 robert.ancell@canonical.com Improve FFI code for windowing (flutter/flutter#183098) 2026-03-02 kevinjchisholm@google.com [workflow] Update the changelog merge action to fetch the stable branch (flutter/flutter#183132) 2026-03-02 engine-flutter-autoroll@skia.org Roll Skia from e180358b7a7a to f886711f180d (2 revisions) (flutter/flutter#183130) 2026-03-02 jacksongardner@google.com Merge changelog from 3.41.3. (flutter/flutter#183131) 2026-03-02 50985133+SpiralMomentum@users.noreply.github.com Make TextDecoration final and unify maskValue across platforms (flutter/flutter#183070) 2026-03-02 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#182640) 2026-03-02 15619084+vashworth@users.noreply.github.com Enable SwiftPM by default on master and beta (flutter/flutter#182923) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC bmparr@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: ...
1 parent bf3a29c commit fe3de64

4 files changed

Lines changed: 40 additions & 8 deletions

File tree

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
46fb7210422d8c0733aa89b34cc0aa48b632bc8e
1+
d3dd7744e81f0ed11d535d0bbfb633affb79345e

packages/pigeon/platform_tests/alternate_language_test_plugin/darwin/alternate_language_test_plugin/Sources/alternate_language_test_plugin/include/alternate_language_test_plugin/AlternateLanguageTestPlugin.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#include <TargetConditionals.h>
6+
57
#if TARGET_OS_OSX
68
#import <FlutterMacOS/FlutterMacOS.h>
79
#else

script/tool/lib/src/create_all_packages_app_command.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,13 +424,17 @@ dev_dependencies:${_pubspecMapString(pubspec.devDependencies)}
424424
final File podfile = app
425425
.platformDirectory(FlutterPlatform.macos)
426426
.childFile('Podfile');
427-
_adjustFile(
428-
podfile,
429-
replacements: <String, List<String>>{
430-
// macOS 10.15 is required by in_app_purchase.
431-
'platform :osx': <String>["platform :osx, '10.15'"],
432-
},
433-
);
427+
if (podfile.existsSync()) {
428+
_adjustFile(
429+
podfile,
430+
replacements: <String, List<String>>{
431+
// macOS 10.15 is required by in_app_purchase.
432+
'platform :osx': <String>["platform :osx, '10.15'"],
433+
},
434+
);
435+
} else {
436+
print('Unable to find ${podfile.path} for updating. Skipping.');
437+
}
434438
}
435439

436440
Future<void> _updateMacOSPbxproj() async {

script/tool/test/create_all_packages_app_command_test.dart

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,5 +659,31 @@ platform :osx, '10.11'
659659
// Podfile is only generated (and thus only edited) on macOS.
660660
skip: !io.Platform.isMacOS,
661661
);
662+
663+
test(
664+
'macOS skips change to Podfile if file does not exist',
665+
() async {
666+
writeFakeFlutterCreateOutput(testRoot);
667+
createFakePlugin('plugina', packagesDir);
668+
669+
final File podfileFile = RepositoryPackage(
670+
command.packagesDir.parent.childDirectory(allPackagesProjectName),
671+
).platformDirectory(FlutterPlatform.macos).childFile('Podfile');
672+
podfileFile.deleteSync();
673+
expect(podfileFile.existsSync(), isFalse);
674+
675+
final List<String> prints = await runCapturingPrint(runner, <String>[
676+
'create-all-packages-app',
677+
]);
678+
expect(
679+
prints,
680+
contains(
681+
'Unable to find ${podfileFile.path} for updating. Skipping.',
682+
),
683+
);
684+
},
685+
// Podfile is only generated (and thus only edited) on macOS.
686+
skip: !io.Platform.isMacOS,
687+
);
662688
});
663689
}

0 commit comments

Comments
 (0)