[flutter_releases] Flutter beta 3.1.0 Framework Cherrypicks (#104663)
* [flutter_tools] update feature defaults (#102937)
* 'Create candidate branch version flutter-2.13-candidate.5 for beta'
* 'Update Engine revision to 44e5b38ee83a1282981a30abc08ffcf6cd0e44bd for beta release 3.1.0'
* Update features.dart (#102766)
* Remove armv7 codesigning.
Co-authored-by: Christopher Fujino <christopherfujino@gmail.com>
Co-authored-by: Tim Sneath <timsneath@google.com>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 0529b87..ceb873d 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-c6ea046c2cdaf3fb2428b31108eae3c3b1174e6e
+44e5b38ee83a1282981a30abc08ffcf6cd0e44bd
diff --git a/bin/internal/release-candidate-branch.version b/bin/internal/release-candidate-branch.version
new file mode 100644
index 0000000..fd2a018
--- /dev/null
+++ b/bin/internal/release-candidate-branch.version
@@ -0,0 +1 @@
+3.1.0
diff --git a/dev/conductor/core/lib/src/codesign.dart b/dev/conductor/core/lib/src/codesign.dart
index 271a5bc..eb52e5f 100644
--- a/dev/conductor/core/lib/src/codesign.dart
+++ b/dev/conductor/core/lib/src/codesign.dart
@@ -156,11 +156,8 @@
'artifacts/engine/darwin-x64/gen_snapshot_arm64',
'artifacts/engine/darwin-x64/gen_snapshot_x64',
'artifacts/engine/ios-profile/gen_snapshot_arm64',
- 'artifacts/engine/ios-profile/gen_snapshot_armv7',
'artifacts/engine/ios-release/gen_snapshot_arm64',
- 'artifacts/engine/ios-release/gen_snapshot_armv7',
'artifacts/engine/ios/gen_snapshot_arm64',
- 'artifacts/engine/ios/gen_snapshot_armv7',
'artifacts/libimobiledevice/idevicescreenshot',
'artifacts/libimobiledevice/idevicesyslog',
'artifacts/libimobiledevice/libimobiledevice-1.0.6.dylib',
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index f94f031..d595552 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -94,15 +94,17 @@
name: 'support for desktop on macOS',
configSetting: 'enable-macos-desktop',
environmentOverride: 'FLUTTER_MACOS',
- extraHelpText: 'Newer beta versions are available on the beta channel.',
master: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
beta: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
stable: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
);
@@ -111,15 +113,17 @@
name: 'support for desktop on Linux',
configSetting: 'enable-linux-desktop',
environmentOverride: 'FLUTTER_LINUX',
- extraHelpText: 'Newer beta versions are available on the beta channel.',
master: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
beta: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
stable: FeatureChannelSetting(
available: true,
+ enabledByDefault: true,
),
);
diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart
index d8a460a..c8e2036 100644
--- a/packages/flutter_tools/test/general.shard/features_test.dart
+++ b/packages/flutter_tools/test/general.shard/features_test.dart
@@ -90,15 +90,13 @@
testWithoutContext('Flutter macOS desktop help string', () {
expect(flutterMacOSDesktopFeature.generateHelpMessage(),
'Enable or disable support for desktop on macOS. '
- 'This setting will take effect on the master, beta, and stable channels. '
- 'Newer beta versions are available on the beta channel.');
+ 'This setting will take effect on the master, beta, and stable channels.');
});
testWithoutContext('Flutter Linux desktop help string', () {
expect(flutterLinuxDesktopFeature.generateHelpMessage(),
'Enable or disable support for desktop on Linux. '
- 'This setting will take effect on the master, beta, and stable channels. '
- 'Newer beta versions are available on the beta channel.');
+ 'This setting will take effect on the master, beta, and stable channels.');
});
testWithoutContext('Flutter Windows desktop help string', () {
@@ -367,36 +365,24 @@
expect(featureFlags.isWindowsEnabled, true);
});
- // Windows UWP desktop
+ for (final Feature feature in <Feature>[
+ flutterWindowsDesktopFeature,
+ flutterMacOSDesktopFeature,
+ flutterLinuxDesktopFeature,
+ ]) {
+ test('${feature.name} available and enabled by default on master', () {
+ expect(feature.master.enabledByDefault, true);
+ expect(feature.master.available, true);
+ });
+ test('${feature.name} available and enabled by default on beta', () {
+ expect(feature.beta.enabledByDefault, true);
+ expect(feature.beta.available, true);
+ });
+ test('${feature.name} available and enabled by default on stable', () {
+ expect(feature.stable.enabledByDefault, true);
+ expect(feature.stable.available, true);
+ });
+ }
- testWithoutContext('Flutter Windows UWP desktop off by default on master', () {
- final FeatureFlags featureFlags = createFlags('master');
-
- expect(featureFlags.isWindowsUwpEnabled, false);
- });
-
- testWithoutContext('Flutter Windows UWP desktop enabled with config on master', () {
- final FeatureFlags featureFlags = createFlags('master');
- testConfig.setValue('enable-windows-uwp-desktop', true);
-
- expect(featureFlags.isWindowsUwpEnabled, true);
- });
-
- testWithoutContext('Flutter Windows UWP desktop config includes removal warning', () {
- expect(windowsUwpEmbedding.extraHelpText, contains('Windows UWP support is obsolete and will be removed'));
- });
-
- testWithoutContext('Flutter Windows UWP desktop off by default on stable', () {
- final FeatureFlags featureFlags = createFlags('stable');
-
- expect(featureFlags.isWindowsUwpEnabled, false);
- });
-
- testWithoutContext('Flutter Windows UWP desktop not enabled with config on stable', () {
- final FeatureFlags featureFlags = createFlags('stable');
- testConfig.setValue('enable-windows-uwp-desktop', true);
-
- expect(featureFlags.isWindowsUwpEnabled, false);
- });
});
}
