Skip to content

Commit 6fafa41

Browse files
hiltonchiltonc
committed
Migrate to Swift 4.2
1 parent 8b379cb commit 6fafa41

File tree

13 files changed

+71
-24
lines changed

13 files changed

+71
-24
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.2

‎CollectionViewIndex.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "CollectionViewIndex"
3-
s.version = "2.0.0"
3+
s.version = "3.0.0"
44
s.summary = "View that replicates the built in UITableView section index, but for use in UICollectionView."
55
s.author = 'Hilton Campbell'
66
s.homepage = "https://github.com/CrossWaterBridge/CollectionViewIndex"

‎CollectionViewIndex.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@
9494
isa = PBXProject;
9595
attributes = {
9696
LastSwiftUpdateCheck = 0720;
97-
LastUpgradeCheck = 0720;
97+
LastUpgradeCheck = 1010;
9898
ORGANIZATIONNAME = "Hilton Campbell";
9999
TargetAttributes = {
100100
D9D6082C1C24670000B10DA6 = {
101101
CreatedOnToolsVersion = 7.2;
102-
LastSwiftMigration = 0800;
102+
LastSwiftMigration = 1010;
103103
};
104104
};
105105
};
@@ -150,13 +150,23 @@
150150
CLANG_CXX_LIBRARY = "libc++";
151151
CLANG_ENABLE_MODULES = YES;
152152
CLANG_ENABLE_OBJC_ARC = YES;
153+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
153154
CLANG_WARN_BOOL_CONVERSION = YES;
155+
CLANG_WARN_COMMA = YES;
154156
CLANG_WARN_CONSTANT_CONVERSION = YES;
157+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
155158
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
156159
CLANG_WARN_EMPTY_BODY = YES;
157160
CLANG_WARN_ENUM_CONVERSION = YES;
161+
CLANG_WARN_INFINITE_RECURSION = YES;
158162
CLANG_WARN_INT_CONVERSION = YES;
163+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
164+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
165+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
159166
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
167+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
168+
CLANG_WARN_STRICT_PROTOTYPES = YES;
169+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
160170
CLANG_WARN_UNREACHABLE_CODE = YES;
161171
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
162172
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -198,13 +208,23 @@
198208
CLANG_CXX_LIBRARY = "libc++";
199209
CLANG_ENABLE_MODULES = YES;
200210
CLANG_ENABLE_OBJC_ARC = YES;
211+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
201212
CLANG_WARN_BOOL_CONVERSION = YES;
213+
CLANG_WARN_COMMA = YES;
202214
CLANG_WARN_CONSTANT_CONVERSION = YES;
215+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
203216
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
204217
CLANG_WARN_EMPTY_BODY = YES;
205218
CLANG_WARN_ENUM_CONVERSION = YES;
219+
CLANG_WARN_INFINITE_RECURSION = YES;
206220
CLANG_WARN_INT_CONVERSION = YES;
221+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
222+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
223+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
207224
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
225+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
226+
CLANG_WARN_STRICT_PROTOTYPES = YES;
227+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
208228
CLANG_WARN_UNREACHABLE_CODE = YES;
209229
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
210230
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -224,6 +244,7 @@
224244
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
225245
MTL_ENABLE_DEBUG_INFO = NO;
226246
SDKROOT = iphoneos;
247+
SWIFT_COMPILATION_MODE = wholemodule;
227248
TARGETED_DEVICE_FAMILY = "1,2";
228249
VALIDATE_PRODUCT = YES;
229250
VERSIONING_SYSTEM = "apple-generic";
@@ -235,6 +256,7 @@
235256
isa = XCBuildConfiguration;
236257
buildSettings = {
237258
CLANG_ENABLE_MODULES = YES;
259+
CODE_SIGN_IDENTITY = "";
238260
DEFINES_MODULE = YES;
239261
DYLIB_COMPATIBILITY_VERSION = 1;
240262
DYLIB_CURRENT_VERSION = 1;
@@ -246,14 +268,15 @@
246268
PRODUCT_NAME = "$(TARGET_NAME)";
247269
SKIP_INSTALL = YES;
248270
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
249-
SWIFT_VERSION = 3.0;
271+
SWIFT_VERSION = 4.2;
250272
};
251273
name = Debug;
252274
};
253275
D9D608431C24670000B10DA6 /* Release */ = {
254276
isa = XCBuildConfiguration;
255277
buildSettings = {
256278
CLANG_ENABLE_MODULES = YES;
279+
CODE_SIGN_IDENTITY = "";
257280
DEFINES_MODULE = YES;
258281
DYLIB_COMPATIBILITY_VERSION = 1;
259282
DYLIB_CURRENT_VERSION = 1;
@@ -264,7 +287,7 @@
264287
PRODUCT_BUNDLE_IDENTIFIER = com.crosswaterbridge.CollectionViewIndex;
265288
PRODUCT_NAME = "$(TARGET_NAME)";
266289
SKIP_INSTALL = YES;
267-
SWIFT_VERSION = 3.0;
290+
SWIFT_VERSION = 4.2;
268291
};
269292
name = Release;
270293
};

‎CollectionViewIndex.xcodeproj/xcshareddata/xcschemes/CollectionViewIndex.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 = "0800"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CollectionViewIndex.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>

‎CollectionViewIndex/CollectionViewIndex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2015 Hilton Campbell
2+
// Copyright (c) 2018 Hilton Campbell
33
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal

‎CollectionViewIndex/CollectionViewIndex.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2015 Hilton Campbell
2+
// Copyright (c) 2018 Hilton Campbell
33
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal
@@ -129,7 +129,7 @@ public class CollectionViewIndex: UIControl {
129129
}
130130

131131
func attributedStringForTitle(_ title: String) -> NSAttributedString {
132-
return NSAttributedString(string: title, attributes: [NSFontAttributeName: font, NSForegroundColorAttributeName: tintColor])
132+
return NSAttributedString(string: title, attributes: [.font: font, .foregroundColor: tintColor])
133133
}
134134

135135
public override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {

‎CollectionViewIndexDemo.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@
150150
isa = PBXProject;
151151
attributes = {
152152
LastSwiftUpdateCheck = 0720;
153-
LastUpgradeCheck = 0800;
153+
LastUpgradeCheck = 1010;
154154
ORGANIZATIONNAME = "Hilton Campbell";
155155
TargetAttributes = {
156156
D9D6084F1C246D9000B10DA6 = {
157157
CreatedOnToolsVersion = 7.2;
158-
LastSwiftMigration = 0800;
158+
LastSwiftMigration = 1010;
159159
};
160160
D9D608631C246D9000B10DA6 = {
161161
CreatedOnToolsVersion = 7.2;
162-
LastSwiftMigration = 0800;
162+
LastSwiftMigration = 1010;
163163
TestTargetID = D9D6084F1C246D9000B10DA6;
164164
};
165165
};
@@ -250,14 +250,22 @@
250250
CLANG_CXX_LIBRARY = "libc++";
251251
CLANG_ENABLE_MODULES = YES;
252252
CLANG_ENABLE_OBJC_ARC = YES;
253+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
253254
CLANG_WARN_BOOL_CONVERSION = YES;
255+
CLANG_WARN_COMMA = YES;
254256
CLANG_WARN_CONSTANT_CONVERSION = YES;
257+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
255258
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
256259
CLANG_WARN_EMPTY_BODY = YES;
257260
CLANG_WARN_ENUM_CONVERSION = YES;
258261
CLANG_WARN_INFINITE_RECURSION = YES;
259262
CLANG_WARN_INT_CONVERSION = YES;
263+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
264+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
265+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
260266
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
267+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
268+
CLANG_WARN_STRICT_PROTOTYPES = YES;
261269
CLANG_WARN_SUSPICIOUS_MOVE = YES;
262270
CLANG_WARN_UNREACHABLE_CODE = YES;
263271
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -297,14 +305,22 @@
297305
CLANG_CXX_LIBRARY = "libc++";
298306
CLANG_ENABLE_MODULES = YES;
299307
CLANG_ENABLE_OBJC_ARC = YES;
308+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
300309
CLANG_WARN_BOOL_CONVERSION = YES;
310+
CLANG_WARN_COMMA = YES;
301311
CLANG_WARN_CONSTANT_CONVERSION = YES;
312+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
302313
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
303314
CLANG_WARN_EMPTY_BODY = YES;
304315
CLANG_WARN_ENUM_CONVERSION = YES;
305316
CLANG_WARN_INFINITE_RECURSION = YES;
306317
CLANG_WARN_INT_CONVERSION = YES;
318+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
319+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
320+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
307321
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
322+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
323+
CLANG_WARN_STRICT_PROTOTYPES = YES;
308324
CLANG_WARN_SUSPICIOUS_MOVE = YES;
309325
CLANG_WARN_UNREACHABLE_CODE = YES;
310326
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -338,7 +354,7 @@
338354
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
339355
PRODUCT_BUNDLE_IDENTIFIER = com.crosswaterbridge.CollectionViewIndexDemo;
340356
PRODUCT_NAME = "$(TARGET_NAME)";
341-
SWIFT_VERSION = 3.0;
357+
SWIFT_VERSION = 4.2;
342358
};
343359
name = Debug;
344360
};
@@ -350,7 +366,7 @@
350366
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
351367
PRODUCT_BUNDLE_IDENTIFIER = com.crosswaterbridge.CollectionViewIndexDemo;
352368
PRODUCT_NAME = "$(TARGET_NAME)";
353-
SWIFT_VERSION = 3.0;
369+
SWIFT_VERSION = 4.2;
354370
};
355371
name = Release;
356372
};
@@ -362,7 +378,7 @@
362378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
363379
PRODUCT_BUNDLE_IDENTIFIER = com.crosswaterbridge.CollectionViewIndexDemoTests;
364380
PRODUCT_NAME = "$(TARGET_NAME)";
365-
SWIFT_VERSION = 3.0;
381+
SWIFT_VERSION = 4.2;
366382
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CollectionViewIndexDemo.app/CollectionViewIndexDemo";
367383
};
368384
name = Debug;
@@ -375,7 +391,7 @@
375391
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
376392
PRODUCT_BUNDLE_IDENTIFIER = com.crosswaterbridge.CollectionViewIndexDemoTests;
377393
PRODUCT_NAME = "$(TARGET_NAME)";
378-
SWIFT_VERSION = 3.0;
394+
SWIFT_VERSION = 4.2;
379395
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CollectionViewIndexDemo.app/CollectionViewIndexDemo";
380396
};
381397
name = Release;

‎CollectionViewIndexDemo.xcodeproj/xcshareddata/xcschemes/CollectionViewIndexDemo.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 = "0800"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CollectionViewIndexDemo/AppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2015 Hilton Campbell
2+
// Copyright (c) 2018 Hilton Campbell
33
//
44
// Permission is hereby granted, free of charge, to any person obtaining a copy
55
// of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2727

2828
var window: UIWindow?
2929

30-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
30+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3131
let viewController = ViewController()
3232

3333
let navigationController = UINavigationController(rootViewController: viewController)

0 commit comments

Comments
 (0)