Skip to content

Commit dc9e496

Browse files
PiinksPiinks
committed
Merge branch 'master' of github.com:flutter/flutter into goldenFlake3
2 parents 3e88c94 + 2e85e74 commit dc9e496

File tree

170 files changed

+9227
-2699
lines changed

Some content is hidden

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

170 files changed

+9227
-2699
lines changed

‎.ci.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ platform_properties:
7878
device_type: none
7979
cpu: x86 # TODO(jmagman): https://github.com/flutter/flutter/issues/112130
8080
xcode: 14a5294e # xcode 14.0 beta 5
81-
cleanup_xcode_cache: "true"
8281
mac_arm64:
8382
properties:
8483
dependencies: >-
@@ -87,7 +86,6 @@ platform_properties:
8786
device_type: none
8887
cpu: arm64
8988
xcode: 14a5294e # xcode 14.0 beta 5
90-
cleanup_xcode_cache: "true"
9189
mac_x64:
9290
properties:
9391
dependencies: >-
@@ -96,7 +94,6 @@ platform_properties:
9694
device_type: none
9795
cpu: x86
9896
xcode: 14a5294e # xcode 14.0 beta 5
99-
cleanup_xcode_cache: "true"
10097
mac_android:
10198
properties:
10299
dependencies: >-
@@ -229,7 +226,6 @@ targets:
229226
230227
- name: Linux build_tests_2_3
231228
recipe: flutter/flutter_drone
232-
bringup: true
233229
timeout: 60
234230
properties:
235231
dependencies: >-
@@ -1999,7 +1995,6 @@ targets:
19991995

20001996
- name: Linux_android new_gallery__transition_perf
20011997
recipe: devicelab/devicelab_drone
2002-
bringup: true # Flaky: https://github.com/flutter/flutter/issues/114025
20031998
presubmit: false
20041999
timeout: 60
20052000
properties:

‎bin/internal/engine.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a98c82a5e5838a52e1b9b41f7b73765adf36b2d0
1+
004a305166d57756cf7c5f6255dd09a5cf43479d

‎bin/internal/flutter_plugins.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5c11747ae1435eb41018845f02effc4a3e9f9c05
1+
3ca34103db0f12e2449370a95deb026f6fb7bb96

‎bin/internal/fuchsia-linux.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
HIyR3VT4K1bz5xMC_uQxTNXM0Gm9tXpVcMkfmDYiBmkC
1+
mDzQK4ZUk_Y4wfZa_uWA6gn3h-Zv28dRjMCZqWd3beUC

‎bin/internal/fuchsia-mac.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8crH2J8BDsDv1fcgYb2n3fPMq6TwGABq6Vs-urNtQYYC
1+
sa5bVGimNo3JwLV27Wpu8RLzitWUvIeqJtAqcrtplosC

‎dev/benchmarks/complex_layout/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.13'
1+
platform :osx, '10.14'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎dev/benchmarks/complex_layout/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
388388
GCC_WARN_UNUSED_FUNCTION = YES;
389389
GCC_WARN_UNUSED_VARIABLE = YES;
390-
MACOSX_DEPLOYMENT_TARGET = 10.13;
390+
MACOSX_DEPLOYMENT_TARGET = 10.14;
391391
MTL_ENABLE_DEBUG_INFO = NO;
392392
SDKROOT = macosx;
393393
SWIFT_COMPILATION_MODE = wholemodule;
@@ -466,7 +466,7 @@
466466
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
467467
GCC_WARN_UNUSED_FUNCTION = YES;
468468
GCC_WARN_UNUSED_VARIABLE = YES;
469-
MACOSX_DEPLOYMENT_TARGET = 10.13;
469+
MACOSX_DEPLOYMENT_TARGET = 10.14;
470470
MTL_ENABLE_DEBUG_INFO = YES;
471471
ONLY_ACTIVE_ARCH = YES;
472472
SDKROOT = macosx;
@@ -513,7 +513,7 @@
513513
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
514514
GCC_WARN_UNUSED_FUNCTION = YES;
515515
GCC_WARN_UNUSED_VARIABLE = YES;
516-
MACOSX_DEPLOYMENT_TARGET = 10.13;
516+
MACOSX_DEPLOYMENT_TARGET = 10.14;
517517
MTL_ENABLE_DEBUG_INFO = NO;
518518
SDKROOT = macosx;
519519
SWIFT_COMPILATION_MODE = wholemodule;

‎dev/benchmarks/macrobenchmarks/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.13'
1+
platform :osx, '10.14'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎dev/benchmarks/macrobenchmarks/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
401401
GCC_WARN_UNUSED_FUNCTION = YES;
402402
GCC_WARN_UNUSED_VARIABLE = YES;
403-
MACOSX_DEPLOYMENT_TARGET = 10.13;
403+
MACOSX_DEPLOYMENT_TARGET = 10.14;
404404
MTL_ENABLE_DEBUG_INFO = NO;
405405
SDKROOT = macosx;
406406
SWIFT_COMPILATION_MODE = wholemodule;
@@ -479,7 +479,7 @@
479479
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
480480
GCC_WARN_UNUSED_FUNCTION = YES;
481481
GCC_WARN_UNUSED_VARIABLE = YES;
482-
MACOSX_DEPLOYMENT_TARGET = 10.13;
482+
MACOSX_DEPLOYMENT_TARGET = 10.14;
483483
MTL_ENABLE_DEBUG_INFO = YES;
484484
ONLY_ACTIVE_ARCH = YES;
485485
SDKROOT = macosx;
@@ -526,7 +526,7 @@
526526
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
527527
GCC_WARN_UNUSED_FUNCTION = YES;
528528
GCC_WARN_UNUSED_VARIABLE = YES;
529-
MACOSX_DEPLOYMENT_TARGET = 10.13;
529+
MACOSX_DEPLOYMENT_TARGET = 10.14;
530530
MTL_ENABLE_DEBUG_INFO = NO;
531531
SDKROOT = macosx;
532532
SWIFT_COMPILATION_MODE = wholemodule;

‎dev/benchmarks/multiple_flutters/module/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
meta: 1.8.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2727
path: 1.8.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
2828
path_provider: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
29-
path_provider_android: 2.0.20 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
29+
path_provider_android: 2.0.21 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3030
path_provider_ios: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3131
path_provider_linux: 2.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3232
path_provider_macos: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -51,4 +51,4 @@ flutter:
5151
androidPackage: com.example.multiple_flutters_module
5252
iosBundleIdentifier: com.example.multipleFluttersModule
5353

54-
# PUBSPEC CHECKSUM: 48f6
54+
# PUBSPEC CHECKSUM: e3f7

0 commit comments

Comments
 (0)