Skip to content

Commit b651ba2

Browse files
timothy1eetimothy1ee
committed
Update to Xcode 11, Swift 5
1 parent bd14126 commit b651ba2

File tree

59 files changed

+1297
-1045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1297
-1045
lines changed

‎Flicks.xcodeproj/project.pbxproj

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
E1C040681DADEBEB00BA871C /* Frameworks */,
137137
E1C040691DADEBEB00BA871C /* Resources */,
138138
158739F243989E4A604CB473 /* [CP] Embed Pods Frameworks */,
139-
26A002506A4EED21A3ABE237 /* [CP] Copy Pods Resources */,
140139
);
141140
buildRules = (
142141
);
@@ -154,7 +153,7 @@
154153
isa = PBXProject;
155154
attributes = {
156155
LastSwiftUpdateCheck = 0800;
157-
LastUpgradeCheck = 0800;
156+
LastUpgradeCheck = 1110;
158157
ORGANIZATIONNAME = "James Zhou";
159158
TargetAttributes = {
160159
E1C0406A1DADEBEB00BA871C = {
@@ -169,6 +168,7 @@
169168
developmentRegion = English;
170169
hasScannedForEncodings = 0;
171170
knownRegions = (
171+
English,
172172
en,
173173
Base,
174174
);
@@ -202,28 +202,18 @@
202202
files = (
203203
);
204204
inputPaths = (
205+
"${PODS_ROOT}/Target Support Files/Pods-Flicks/Pods-Flicks-frameworks.sh",
206+
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
207+
"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
205208
);
206209
name = "[CP] Embed Pods Frameworks";
207210
outputPaths = (
211+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
212+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
208213
);
209214
runOnlyForDeploymentPostprocessing = 0;
210215
shellPath = /bin/sh;
211-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Flicks/Pods-Flicks-frameworks.sh\"\n";
212-
showEnvVarsInLog = 0;
213-
};
214-
26A002506A4EED21A3ABE237 /* [CP] Copy Pods Resources */ = {
215-
isa = PBXShellScriptBuildPhase;
216-
buildActionMask = 2147483647;
217-
files = (
218-
);
219-
inputPaths = (
220-
);
221-
name = "[CP] Copy Pods Resources";
222-
outputPaths = (
223-
);
224-
runOnlyForDeploymentPostprocessing = 0;
225-
shellPath = /bin/sh;
226-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Flicks/Pods-Flicks-resources.sh\"\n";
216+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Flicks/Pods-Flicks-frameworks.sh\"\n";
227217
showEnvVarsInLog = 0;
228218
};
229219
B80A06E42D1A7C0001CC2E6B /* [CP] Check Pods Manifest.lock */ = {
@@ -232,13 +222,16 @@
232222
files = (
233223
);
234224
inputPaths = (
225+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
226+
"${PODS_ROOT}/Manifest.lock",
235227
);
236228
name = "[CP] Check Pods Manifest.lock";
237229
outputPaths = (
230+
"$(DERIVED_FILE_DIR)/Pods-Flicks-checkManifestLockResult.txt",
238231
);
239232
runOnlyForDeploymentPostprocessing = 0;
240233
shellPath = /bin/sh;
241-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
234+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
242235
showEnvVarsInLog = 0;
243236
};
244237
/* End PBXShellScriptBuildPhase section */
@@ -283,20 +276,29 @@
283276
isa = XCBuildConfiguration;
284277
buildSettings = {
285278
ALWAYS_SEARCH_USER_PATHS = NO;
279+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
286280
CLANG_ANALYZER_NONNULL = YES;
287281
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
288282
CLANG_CXX_LIBRARY = "libc++";
289283
CLANG_ENABLE_MODULES = YES;
290284
CLANG_ENABLE_OBJC_ARC = YES;
285+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
291286
CLANG_WARN_BOOL_CONVERSION = YES;
287+
CLANG_WARN_COMMA = YES;
292288
CLANG_WARN_CONSTANT_CONVERSION = YES;
289+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
293290
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
294291
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
295292
CLANG_WARN_EMPTY_BODY = YES;
296293
CLANG_WARN_ENUM_CONVERSION = YES;
297294
CLANG_WARN_INFINITE_RECURSION = YES;
298295
CLANG_WARN_INT_CONVERSION = YES;
296+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
297+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
298+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
299299
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
300+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
301+
CLANG_WARN_STRICT_PROTOTYPES = YES;
300302
CLANG_WARN_SUSPICIOUS_MOVE = YES;
301303
CLANG_WARN_SUSPICIOUS_MOVES = YES;
302304
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -326,6 +328,7 @@
326328
SDKROOT = iphoneos;
327329
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
328330
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
331+
SWIFT_VERSION = 5.0;
329332
TARGETED_DEVICE_FAMILY = "1,2";
330333
};
331334
name = Debug;
@@ -334,20 +337,29 @@
334337
isa = XCBuildConfiguration;
335338
buildSettings = {
336339
ALWAYS_SEARCH_USER_PATHS = NO;
340+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
337341
CLANG_ANALYZER_NONNULL = YES;
338342
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
339343
CLANG_CXX_LIBRARY = "libc++";
340344
CLANG_ENABLE_MODULES = YES;
341345
CLANG_ENABLE_OBJC_ARC = YES;
346+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
342347
CLANG_WARN_BOOL_CONVERSION = YES;
348+
CLANG_WARN_COMMA = YES;
343349
CLANG_WARN_CONSTANT_CONVERSION = YES;
350+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
344351
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
345352
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
346353
CLANG_WARN_EMPTY_BODY = YES;
347354
CLANG_WARN_ENUM_CONVERSION = YES;
348355
CLANG_WARN_INFINITE_RECURSION = YES;
349356
CLANG_WARN_INT_CONVERSION = YES;
357+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
358+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
359+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
350360
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
361+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
362+
CLANG_WARN_STRICT_PROTOTYPES = YES;
351363
CLANG_WARN_SUSPICIOUS_MOVE = YES;
352364
CLANG_WARN_SUSPICIOUS_MOVES = YES;
353365
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -369,6 +381,7 @@
369381
MTL_ENABLE_DEBUG_INFO = NO;
370382
SDKROOT = iphoneos;
371383
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
384+
SWIFT_VERSION = 5.0;
372385
TARGETED_DEVICE_FAMILY = "1,2";
373386
VALIDATE_PRODUCT = YES;
374387
};
@@ -384,7 +397,7 @@
384397
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
385398
PRODUCT_BUNDLE_IDENTIFIER = com.jameszhou.mobile.Flicks;
386399
PRODUCT_NAME = "$(TARGET_NAME)";
387-
SWIFT_VERSION = 3.0;
400+
SWIFT_VERSION = 5.0;
388401
};
389402
name = Debug;
390403
};
@@ -398,7 +411,7 @@
398411
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
399412
PRODUCT_BUNDLE_IDENTIFIER = com.jameszhou.mobile.Flicks;
400413
PRODUCT_NAME = "$(TARGET_NAME)";
401-
SWIFT_VERSION = 3.0;
414+
SWIFT_VERSION = 5.0;
402415
};
403416
name = Release;
404417
};

‎Flicks.xcodeproj/xcuserdata/tim.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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>SchemeUserState</key>
6+
<dict>
7+
<key>Flicks.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>3</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

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

‎Flicks.xcworkspace/xcuserdata/tim.xcuserdatad/UserInterfaceState.xcuserstate

25.9 KB
Binary file not shown.

‎Flicks.xcworkspace/xcuserdata/zihzhou.xcuserdatad/UserInterfaceState.xcuserstate

-47.9 KB
Binary file not shown.

‎Flicks.xcworkspace/xcuserdata/zihzhou.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

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

‎Flicks/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
16+
internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1717
// Override point for customization after application launch.
1818

1919
window = UIWindow(frame: UIScreen.main.bounds)

‎Flicks/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

‎Flicks/MoviesViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MoviesViewController: UIViewController, UITableViewDataSource, UITableView
2727
super.viewDidLoad()
2828

2929
self.navigationController?.navigationBar.barTintColor = UIConstants.primaryColor
30-
self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
30+
self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
3131
self.navigationController?.navigationBar.tintColor = UIColor.white
3232

3333
let refreshControl = UIRefreshControl()
@@ -61,7 +61,7 @@ class MoviesViewController: UIViewController, UITableViewDataSource, UITableView
6161
self.movieTableView.reloadData()
6262
}
6363

64-
func refreshControlAction(refreshControl: UIRefreshControl) {
64+
@objc func refreshControlAction(refreshControl: UIRefreshControl) {
6565

6666
refresh { (result) in
6767
refreshControl.endRefreshing()

‎Podfile.lock

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,34 @@
11
PODS:
2-
- AFNetworking (3.1.0):
3-
- AFNetworking/NSURLSession (= 3.1.0)
4-
- AFNetworking/Reachability (= 3.1.0)
5-
- AFNetworking/Security (= 3.1.0)
6-
- AFNetworking/Serialization (= 3.1.0)
7-
- AFNetworking/UIKit (= 3.1.0)
8-
- AFNetworking/NSURLSession (3.1.0):
2+
- AFNetworking (3.2.1):
3+
- AFNetworking/NSURLSession (= 3.2.1)
4+
- AFNetworking/Reachability (= 3.2.1)
5+
- AFNetworking/Security (= 3.2.1)
6+
- AFNetworking/Serialization (= 3.2.1)
7+
- AFNetworking/UIKit (= 3.2.1)
8+
- AFNetworking/NSURLSession (3.2.1):
99
- AFNetworking/Reachability
1010
- AFNetworking/Security
1111
- AFNetworking/Serialization
12-
- AFNetworking/Reachability (3.1.0)
13-
- AFNetworking/Security (3.1.0)
14-
- AFNetworking/Serialization (3.1.0)
15-
- AFNetworking/UIKit (3.1.0):
12+
- AFNetworking/Reachability (3.2.1)
13+
- AFNetworking/Security (3.2.1)
14+
- AFNetworking/Serialization (3.2.1)
15+
- AFNetworking/UIKit (3.2.1):
1616
- AFNetworking/NSURLSession
17-
- MBProgressHUD (1.0.0)
17+
- MBProgressHUD (1.1.0)
1818

1919
DEPENDENCIES:
2020
- AFNetworking
2121
- MBProgressHUD
2222

23+
SPEC REPOS:
24+
https://github.com/CocoaPods/Specs.git:
25+
- AFNetworking
26+
- MBProgressHUD
27+
2328
SPEC CHECKSUMS:
24-
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
25-
MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a
29+
AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
30+
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
2631

27-
PODFILE CHECKSUM: 2fe917e50e3d665e7587b519e2dc87efa356aa81
32+
PODFILE CHECKSUM: 12b63a08a0b6b5681c18c242e02104d2a16cf243
2833

29-
COCOAPODS: 1.1.0.rc.2
34+
COCOAPODS: 1.8.3

‎Pods/AFNetworking/AFNetworking/AFCompatibilityMacros.h

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)