Skip to content

Commit 7cf6bd5

Browse files
author
Luc Dion
committed
Upgrade to Swift 4.2
1 parent 8f00d06 commit 7cf6bd5

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

LayoutFrameworkBenchmark.xcodeproj/project.pbxproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@
241241
TargetAttributes = {
242242
24661CFB1F4EFFF5002CB883 = {
243243
CreatedOnToolsVersion = 8.3.2;
244-
DevelopmentTeam = 4Q596JWQC5;
245-
LastSwiftMigration = 0920;
244+
DevelopmentTeam = ZYH5WDPX24;
245+
LastSwiftMigration = 1010;
246246
ProvisioningStyle = Automatic;
247247
};
248248
};
@@ -481,14 +481,13 @@
481481
buildSettings = {
482482
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
483483
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
484-
DEVELOPMENT_TEAM = 4Q596JWQC5;
484+
DEVELOPMENT_TEAM = ZYH5WDPX24;
485485
INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
486486
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
487487
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark;
488488
PRODUCT_NAME = "$(TARGET_NAME)";
489489
PROVISIONING_PROFILE_SPECIFIER = "";
490-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
491-
SWIFT_VERSION = 4.0;
490+
SWIFT_VERSION = 4.2;
492491
};
493492
name = Debug;
494493
};
@@ -498,14 +497,13 @@
498497
buildSettings = {
499498
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
500499
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
501-
DEVELOPMENT_TEAM = 4Q596JWQC5;
500+
DEVELOPMENT_TEAM = ZYH5WDPX24;
502501
INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
503502
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
504503
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark;
505504
PRODUCT_NAME = "$(TARGET_NAME)";
506505
PROVISIONING_PROFILE_SPECIFIER = "";
507-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
508-
SWIFT_VERSION = 4.0;
506+
SWIFT_VERSION = 4.2;
509507
};
510508
name = Release;
511509
};

LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
</AdditionalOptions>
4343
</TestAction>
4444
<LaunchAction
45-
buildConfiguration = "Release"
46-
selectedDebuggerIdentifier = ""
47-
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4848
launchStyle = "0"
4949
useCustomWorkingDirectory = "NO"
5050
ignoresPersistentStateOnLaunch = "NO"

LayoutFrameworkBenchmark/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
1818
window = UIWindow(frame: UIScreen.main.bounds)
1919
window?.rootViewController = UINavigationController(rootViewController: BenchmarkViewController())
2020
window?.makeKeyAndVisible()

LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class BenchmarkViewController: UITableViewController {
2929
return CollectionViewControllerFeedItemFlexLayoutView(data: data)
3030
}),
3131

32-
ViewControllerData(title: "LayoutKit 7.0", factoryBlock: { viewCount in
32+
ViewControllerData(title: "LayoutKit 10.0", factoryBlock: { viewCount in
3333
let data = FeedItemData.generate(count: viewCount)
3434
return CollectionViewControllerFeedItemLayoutKitView(data: data)
3535
}),
@@ -39,17 +39,17 @@ class BenchmarkViewController: UITableViewController {
3939
return CollectionViewControllerFeedItemManualView(data: data)
4040
}),
4141

42-
ViewControllerData(title: "NKFrameLayoutKit", factoryBlock: { viewCount in
42+
ViewControllerData(title: "NKFrameLayoutKit 2.4", factoryBlock: { viewCount in
4343
let data = FeedItemData.generate(count: viewCount)
4444
return CollectionViewControllerFeedItemNKFrameLayoutKitView(data: data)
4545
}),
4646

47-
ViewControllerData(title: "NotAutoLayout", factoryBlock: { viewCount in
47+
ViewControllerData(title: "NotAutoLayout 3.2", factoryBlock: { viewCount in
4848
let data = FeedItemData.generate(count: viewCount)
4949
return CollectionViewControllerFeedItemNotAutoLayoutView(data: data)
5050
}),
5151

52-
ViewControllerData(title: "PinLayout 1.7", factoryBlock: { viewCount in
52+
ViewControllerData(title: "PinLayout 1.8", factoryBlock: { viewCount in
5353
let data = FeedItemData.generate(count: viewCount)
5454
return CollectionViewControllerFeedItemPinLayoutView(data: data)
5555
}),

0 commit comments

Comments
 (0)