Skip to content

Commit ffb7373

Browse files
lucdionlucdion
authored
Merge pull request #18 from layoutBox/update_swift_4.2
Update to Swift 4.2
2 parents 67eb69f + 013f38e commit ffb7373

File tree

9 files changed

+47
-30
lines changed

9 files changed

+47
-30
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: objective-c
2-
osx_image: xcode9.4
2+
osx_image: xcode10
33

44
before_install:
55
- gem install xcpretty-travis-formatter;
66
- gem install cocoapods --no-document --quiet;
77
- pod install --repo-update;
88

99
script:
10-
- set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.4 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`
10+
- set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator12.0 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`

‎LayoutFrameworkBenchmark.xcodeproj/project.pbxproj

Lines changed: 7 additions & 9 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
};
@@ -290,7 +290,7 @@
290290
"${BUILT_PRODUCTS_DIR}/NKFrameLayoutKit/NKFrameLayoutKit.framework",
291291
"${BUILT_PRODUCTS_DIR}/NotAutoLayout/NotAutoLayout.framework",
292292
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
293-
"${PODS_ROOT}/Reveal-SDK/RevealServer-16/iOS/RevealServer.framework",
293+
"${PODS_ROOT}/Reveal-SDK/RevealServer-19/iOS/RevealServer.framework",
294294
);
295295
name = "[CP] Embed Pods Frameworks";
296296
outputPaths = (
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LayoutFrameworkBenchmark.xcworkspace/contents.xcworkspacedata

100755100644
File mode changed.

‎LayoutFrameworkBenchmark.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎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
}),

‎Podfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,14 @@ target 'LayoutFrameworkBenchmark' do
1717

1818
pod 'Reveal-SDK'
1919
end
20+
21+
22+
post_install do |installer|
23+
installer.pods_project.targets.each do |target|
24+
if ['LayoutKit'].include? target.name
25+
target.build_configurations.each do |config|
26+
config.build_settings['SWIFT_VERSION'] = '4.1'
27+
end
28+
end
29+
end
30+
end

‎Podfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- FlexLayout (1.3.9)
3-
- LayoutKit (8.0.1)
4-
- NKFrameLayoutKit (2.1)
5-
- NotAutoLayout (3.1.1)
6-
- PinLayout (1.7.9)
7-
- Reveal-SDK (16)
2+
- FlexLayout (1.3.11)
3+
- LayoutKit (10.0.1)
4+
- NKFrameLayoutKit (2.4)
5+
- NotAutoLayout (3.2.0)
6+
- PinLayout (1.8.6)
7+
- Reveal-SDK (19)
88

99
DEPENDENCIES:
1010
- FlexLayout
@@ -24,13 +24,13 @@ SPEC REPOS:
2424
- Reveal-SDK
2525

2626
SPEC CHECKSUMS:
27-
FlexLayout: dbe4b2da72ee63d7145cf32bb5bfba375aeeb9e6
28-
LayoutKit: dab1c2eea7a0bf9d8d755a8a793f87a929768455
29-
NKFrameLayoutKit: 6a2f6ac34f85d495e683ea0f7f1605903a4d3e00
30-
NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
31-
PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
32-
Reveal-SDK: ed36bdbb3cbf90b94ae5da0dbcb3c7ae6738c51f
27+
FlexLayout: b008184d23aae0c56e1c916e803445a13a6f4e5a
28+
LayoutKit: 4e69fb0f1cc3e9c2a764b58f99e88004f5da861c
29+
NKFrameLayoutKit: c119f04a6ac305c7db5e29e1b856cee0e8a661bb
30+
NotAutoLayout: 4723ad82a21a7c6c60c823fff7f7c29467811b92
31+
PinLayout: fe2a2432d6982588e208572005c941aeeae417ab
32+
Reveal-SDK: 9f0d2c6c12eb7507921e5454ac165b7aa21140a4
3333

34-
PODFILE CHECKSUM: 7f58ddd1b9687b031aeb33d986faeaf19ed0e225
34+
PODFILE CHECKSUM: 3e63d42365b39b217c5809f0c7ebad9865d228e2
3535

3636
COCOAPODS: 1.5.3

0 commit comments

Comments
 (0)