Skip to content

Commit 1b59605

Browse files
auto-submit[bot]auto-submit[bot]
andauthored
Reverts "Enable UIScene Migration and update create templates (flutter#178328)" (flutter#178665)
<!-- start_original_pr_link --> Reverts: flutter#178328 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: gaaclarke <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: causing failures in post submit tests example: https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_ios%20platform_channels_benchmarks_ios/24421/overview ``` [2025-11-17 09:10:06.660248] [STDOUT] [STDOUT] [ +7 ms] Checking for advertised Dart VM Services... [2025-11-17 09:10:06.671607] [STDOUT] [STDOUT] [ +11 ms] #0 _NativeSocket.send (dart:io-patch/socket_patch.dart:1524:34) [2 <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: vashworth <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {LongCatIsLooong} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: Updates create templates for both iOS app and module to be migrated to UIScene. Can be tested with: ``` flutter create --platforms=ios my_app flutter create --template module my_module ``` Module is integration tested in [module_test_ios](https://github.com/flutter/flutter/blob/b1d5f03351590a0954d19c7584186f0722323169/dev/devicelab/bin/tasks/module_test_ios.dart#L187-L191). Also, enables the UIScene tool migration to be enabled by default. Fixes flutter#170293. Fixes flutter#177266. Fixes flutter#177265. Fixes flutter#167267. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent 77f3aca commit 1b59605

File tree

15 files changed

+22
-127
lines changed

15 files changed

+22
-127
lines changed

packages/flutter_tools/lib/src/features.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ const uiSceneMigration = Feature(
263263
'otherwise instruct you to migrate manually.',
264264
configSetting: 'enable-uiscene-migration',
265265
environmentOverride: 'FLUTTER_UISCENE_MIGRATION',
266-
master: FeatureChannelSetting(available: true, enabledByDefault: true),
267-
beta: FeatureChannelSetting(available: true, enabledByDefault: true),
268-
stable: FeatureChannelSetting(available: true, enabledByDefault: true),
266+
master: FeatureChannelSetting(available: true),
267+
beta: FeatureChannelSetting(available: true),
268+
stable: FeatureChannelSetting(available: true),
269269
);
270270

271271
/// A [Feature] is a process for conditionally enabling tool features.

packages/flutter_tools/templates/app/ios.tmpl/Runner.xcodeproj/project.pbxproj.tmpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1313
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
14-
7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */; };
1514
{{#withSwiftPackageManager}}
1615
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1716
{{/withSwiftPackageManager}}
@@ -51,7 +50,6 @@
5150
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
5251
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
5352
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
54-
7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
5553
{{#withSwiftPackageManager}}
5654
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
5755
{{/withSwiftPackageManager}}
@@ -130,7 +128,6 @@
130128
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
131129
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
132130
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
133-
7884E8672EC3CC0400C636F2 /* SceneDelegate.swift */,
134131
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
135132
);
136133
path = Runner;
@@ -295,7 +292,6 @@
295292
files = (
296293
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
297294
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
298-
7884E8682EC3CC0700C636F2 /* SceneDelegate.swift in Sources */,
299295
);
300296
runOnlyForDeploymentPostprocessing = 0;
301297
};

packages/flutter_tools/templates/app/ios.tmpl/Runner/AppDelegate.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ import Flutter
22
import UIKit
33

44
@main
5-
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
5+
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,
88
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
99
) -> Bool {
10+
GeneratedPluginRegistrant.register(with: self)
1011
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
1112
}
12-
13-
func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
14-
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
15-
}
1613
}

packages/flutter_tools/templates/app/ios.tmpl/Runner/Info.plist.tmpl

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CADisableMinimumFrameDurationOnPhone</key>
6-
<true/>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>$(DEVELOPMENT_LANGUAGE)</string>
97
<key>CFBundleDisplayName</key>
@@ -26,29 +24,6 @@
2624
<string>$(FLUTTER_BUILD_NUMBER)</string>
2725
<key>LSRequiresIPhoneOS</key>
2826
<true/>
29-
<key>UIApplicationSceneManifest</key>
30-
<dict>
31-
<key>UIApplicationSupportsMultipleScenes</key>
32-
<false/>
33-
<key>UISceneConfigurations</key>
34-
<dict>
35-
<key>UIWindowSceneSessionRoleApplication</key>
36-
<array>
37-
<dict>
38-
<key>UISceneClassName</key>
39-
<string>UIWindowScene</string>
40-
<key>UISceneConfigurationName</key>
41-
<string>flutter</string>
42-
<key>UISceneDelegateClassName</key>
43-
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
44-
<key>UISceneStoryboardFile</key>
45-
<string>Main</string>
46-
</dict>
47-
</array>
48-
</dict>
49-
</dict>
50-
<key>UIApplicationSupportsIndirectInputEvents</key>
51-
<true/>
5227
<key>UILaunchStoryboardName</key>
5328
<string>LaunchScreen</string>
5429
<key>UIMainStoryboardFile</key>
@@ -66,5 +41,9 @@
6641
<string>UIInterfaceOrientationLandscapeLeft</string>
6742
<string>UIInterfaceOrientationLandscapeRight</string>
6843
</array>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
6948
</dict>
7049
</plist>

packages/flutter_tools/templates/app/ios.tmpl/Runner/SceneDelegate.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.tmpl/Info.plist.tmpl

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CADisableMinimumFrameDurationOnPhone</key>
6-
<true/>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>$(DEVELOPMENT_LANGUAGE)</string>
97
<key>CFBundleExecutable</key>
@@ -26,29 +24,6 @@
2624
<string>$(FLUTTER_BUILD_NUMBER)</string>
2725
<key>LSRequiresIPhoneOS</key>
2826
<true/>
29-
<key>UIApplicationSceneManifest</key>
30-
<dict>
31-
<key>UIApplicationSupportsMultipleScenes</key>
32-
<false/>
33-
<key>UISceneConfigurations</key>
34-
<dict>
35-
<key>UIWindowSceneSessionRoleApplication</key>
36-
<array>
37-
<dict>
38-
<key>UISceneClassName</key>
39-
<string>UIWindowScene</string>
40-
<key>UISceneConfigurationName</key>
41-
<string>flutter</string>
42-
<key>UISceneDelegateClassName</key>
43-
<string>SceneDelegate</string>
44-
<key>UISceneStoryboardFile</key>
45-
<string>Main</string>
46-
</dict>
47-
</array>
48-
</dict>
49-
</dict>
50-
<key>UIApplicationSupportsIndirectInputEvents</key>
51-
<true/>
5227
<key>UILaunchStoryboardName</key>
5328
<string>LaunchScreen</string>
5429
<key>UIMainStoryboardFile</key>
@@ -66,5 +41,9 @@
6641
<string>UIInterfaceOrientationLandscapeLeft</string>
6742
<string>UIInterfaceOrientationLandscapeRight</string>
6843
</array>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
6948
</dict>
7049
</plist>

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.tmpl/SceneDelegate.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.tmpl/SceneDelegate.m

Lines changed: 0 additions & 5 deletions
This file was deleted.

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.xcodeproj.tmpl/project.pbxproj.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
7884E86B2EC3CF5C00C636F2 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7884E86A2EC3CF5C00C636F2 /* SceneDelegate.m */; };
1110
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1211
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1312
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -31,8 +30,6 @@
3130
/* Begin PBXFileReference section */
3231
74974046213559DB008C567A /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
3332
74974047213559DB008C567A /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
34-
7884E8692EC3CF5C00C636F2 /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
35-
7884E86A2EC3CF5C00C636F2 /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
3633
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3734
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
3835
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = ../.ios/Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -95,8 +92,6 @@
9592
97C146F01CF9000F007C117D /* Runner */ = {
9693
isa = PBXGroup;
9794
children = (
98-
7884E8692EC3CF5C00C636F2 /* SceneDelegate.h */,
99-
7884E86A2EC3CF5C00C636F2 /* SceneDelegate.m */,
10095
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
10196
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
10297
97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -225,7 +220,6 @@
225220
buildActionMask = 2147483647;
226221
files = (
227222
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
228-
7884E86B2EC3CF5C00C636F2 /* SceneDelegate.m in Sources */,
229223
97C146F31CF9000F007C117D /* main.m in Sources */,
230224
);
231225
runOnlyForDeploymentPostprocessing = 0;

packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Runner.tmpl/AppDelegate.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)