Skip to content

F
Front-End
Unverified Commit dda74a19 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub
Browse files
Options

Increase template Swift version from 4 to 5 (#41882)

parent 649cf820
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 26 deletions
dev/integration_tests/ios_host_app_swift/Host.xcodeproj/project.pbxproj
View file @ dda74a19
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
TargetAttributes = { TargetAttributes = {
F724F2BD2329B8CC0012DB29 = { F724F2BD2329B8CC0012DB29 = {
CreatedOnToolsVersion = 11.0; CreatedOnToolsVersion = 11.0;
LastSwiftMigration = 1100;
}; };
}; };
}; };
...@@ -379,7 +380,7 @@ ...@@ -379,7 +380,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host; PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
}; };
name = Debug; name = Debug;
...@@ -397,7 +398,7 @@ ...@@ -397,7 +398,7 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host; PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2; SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
}; };
name = Release; name = Release;
......
dev/manual_tests/macos/Runner.xcodeproj/project.pbxproj
View file @ dda74a19
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
33CC10ED2044A3C60003C045 /* manual_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "manual_tests.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10ED2044A3C60003C045 /* manual_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = manual_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
TargetAttributes = { TargetAttributes = {
33CC10EC2044A3C60003C045 = { 33CC10EC2044A3C60003C045 = {
CreatedOnToolsVersion = 9.2; CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0920; LastSwiftMigration = 1100;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
SystemCapabilities = { SystemCapabilities = {
com.apple.Sandbox = { com.apple.Sandbox = {
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Profile; name = Profile;
}; };
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Debug; name = Debug;
}; };
...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Release; name = Release;
}; };
......
examples/flutter_view/ios/Runner.xcodeproj/project.pbxproj
View file @ dda74a19
...@@ -394,7 +394,6 @@ ...@@ -394,7 +394,6 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView; PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
}; };
name = Profile; name = Profile;
}; };
...@@ -522,7 +521,6 @@ ...@@ -522,7 +521,6 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView; PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
}; };
name = Debug; name = Debug;
}; };
...@@ -544,7 +542,6 @@ ...@@ -544,7 +542,6 @@
); );
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView; PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.flutterView;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
}; };
name = Release; name = Release;
}; };
......
examples/flutter_view/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist 0 → 100644
View file @ dda74a19
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
examples/platform_channel_swift/ios/Runner.xcodeproj/project.pbxproj
View file @ dda74a19
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0820; LastSwiftMigration = 1100;
}; };
}; };
}; };
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Profile; name = Profile;
}; };
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Debug; name = Debug;
}; };
...@@ -487,7 +487,7 @@ ...@@ -487,7 +487,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Release; name = Release;
}; };
......
examples/platform_channel_swift/ios/Runner/AppDelegate.swift
View file @ dda74a19
...@@ -67,7 +67,7 @@ enum MyFlutterErrorCode { ...@@ -67,7 +67,7 @@ enum MyFlutterErrorCode {
NotificationCenter.default.addObserver( NotificationCenter.default.addObserver(
self, self,
selector: #selector(AppDelegate.onBatteryStateDidChange), selector: #selector(AppDelegate.onBatteryStateDidChange),
name: NSNotification.Name.UIDeviceBatteryStateDidChange, name: UIDevice.batteryStateDidChangeNotification,
object: nil) object: nil)
return nil return nil
} }
......
packages/flutter_tools/templates/app/ios-swift.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
View file @ dda74a19
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1; CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0910; LastSwiftMigration = 1100;
}; };
}; };
}; };
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}}; PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}};
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Profile; name = Profile;
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Debug; name = Debug;
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}}; PRODUCT_BUNDLE_IDENTIFIER = {{iosIdentifier}};
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic"; VERSIONING_SYSTEM = "apple-generic";
}; };
name = Release; name = Release;
...@@ -513,7 +513,6 @@ ...@@ -513,7 +513,6 @@
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 97C146E61CF9000F007C117D /* Project object */; rootObject = 97C146E61CF9000F007C117D /* Project object */;
} }
packages/flutter_tools/templates/app/macos.tmpl/Runner.xcodeproj/project.pbxproj.tmpl
View file @ dda74a19
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
TargetAttributes = { TargetAttributes = {
33CC10EC2044A3C60003C045 = { 33CC10EC2044A3C60003C045 = {
CreatedOnToolsVersion = 9.2; CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 0920; LastSwiftMigration = 1100;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
SystemCapabilities = { SystemCapabilities = {
com.apple.Sandbox = { com.apple.Sandbox = {
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Profile; name = Profile;
}; };
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Debug; name = Debug;
}; };
...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 5.0;
}; };
name = Release; name = Release;
}; };
......
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @ dda74a19
...@@ -186,7 +186,7 @@ void main() { ...@@ -186,7 +186,7 @@ void main() {
when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true); when(mockXcodeProjectInterpreter.isInstalled).thenReturn(true);
when(mockXcodeProjectInterpreter.getBuildSettings(any, any)) when(mockXcodeProjectInterpreter.getBuildSettings(any, any))
.thenAnswer((_) async => <String, String>{ .thenAnswer((_) async => <String, String>{
'SWIFT_VERSION': '4.0', 'SWIFT_VERSION': '5.0',
}); });
final FlutterProject project = FlutterProject.fromPath('project'); final FlutterProject project = FlutterProject.fromPath('project');
......
packages/flutter_tools/test/general.shard/project_test.dart
View file @ dda74a19
...@@ -314,7 +314,7 @@ void main() { ...@@ -314,7 +314,7 @@ void main() {
when(mockXcodeProjectInterpreter.getBuildSettings(any, any)).thenAnswer( when(mockXcodeProjectInterpreter.getBuildSettings(any, any)).thenAnswer(
(_) { (_) {
return Future<Map<String, String>>.value(<String, String>{ return Future<Map<String, String>>.value(<String, String>{
'SWIFT_VERSION': '4.0', 'SWIFT_VERSION': '5.0',
}); });
}); });
addAndroidGradleFile(project.directory, addAndroidGradleFile(project.directory,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab