Skip to content

Commit 5106f87

Browse files
JakeLinJakeLin
committed
Update to Swift 4
1 parent 6daaab5 commit 5106f87

File tree

4 files changed

+56
-21
lines changed

4 files changed

+56
-21
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,6 @@ Carthage.checkout
8181

8282
# Access keys
8383
.access_tokens
84+
85+
# rbenv
86+
.ruby-version

‎Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios, '9.0'
1+
platform :ios, '10.0'
22
use_frameworks!
33

44
target 'SwiftWeather' do

‎Podfile.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
2-
- Nimble (6.0.1)
3-
- Quick (1.1.0)
2+
- Nimble (7.0.2)
3+
- Quick (1.2.0)
44
- SwiftyJSON (3.1.4)
55

66
DEPENDENCIES:
@@ -9,10 +9,10 @@ DEPENDENCIES:
99
- SwiftyJSON
1010

1111
SPEC CHECKSUMS:
12-
Nimble: 1527fd1bd2b4cf0636251a36bc8ab37e81da8347
13-
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
12+
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
13+
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
1414
SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
1515

16-
PODFILE CHECKSUM: 2ec46d3741ab466dee64c9e763366836879c1f6e
16+
PODFILE CHECKSUM: 0737c164b0a514aa337a01ca722b89d99ee844b5
1717

18-
COCOAPODS: 1.2.1.beta.1
18+
COCOAPODS: 1.3.1

‎SwiftWeather.xcodeproj/project.pbxproj

+46-14
Original file line numberDiff line numberDiff line change
@@ -365,21 +365,21 @@
365365
isa = PBXProject;
366366
attributes = {
367367
LastSwiftUpdateCheck = 0710;
368-
LastUpgradeCheck = 0820;
368+
LastUpgradeCheck = 0900;
369369
ORGANIZATIONNAME = "Jake Lin";
370370
TargetAttributes = {
371371
AECBA5E11B836BF20004A536 = {
372372
CreatedOnToolsVersion = 7.0;
373-
LastSwiftMigration = 0820;
373+
LastSwiftMigration = 0900;
374374
};
375375
AECBA5F51B836BF20004A536 = {
376376
CreatedOnToolsVersion = 7.0;
377-
LastSwiftMigration = 0820;
377+
LastSwiftMigration = 0900;
378378
TestTargetID = AECBA5E11B836BF20004A536;
379379
};
380380
AECBA6001B836BF20004A536 = {
381381
CreatedOnToolsVersion = 7.0;
382-
LastSwiftMigration = 0820;
382+
LastSwiftMigration = 0900;
383383
TestTargetID = AECBA5E11B836BF20004A536;
384384
};
385385
};
@@ -440,13 +440,16 @@
440440
files = (
441441
);
442442
inputPaths = (
443+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
444+
"${PODS_ROOT}/Manifest.lock",
443445
);
444446
name = "[CP] Check Pods Manifest.lock";
445447
outputPaths = (
448+
"$(DERIVED_FILE_DIR)/Pods-SwiftWeatherTests-checkManifestLockResult.txt",
446449
);
447450
runOnlyForDeploymentPostprocessing = 0;
448451
shellPath = /bin/sh;
449-
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";
452+
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";
450453
showEnvVarsInLog = 0;
451454
};
452455
3211EE071253F1D6513A17BA /* [CP] Embed Pods Frameworks */ = {
@@ -455,9 +458,14 @@
455458
files = (
456459
);
457460
inputPaths = (
461+
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftWeatherTests/Pods-SwiftWeatherTests-frameworks.sh",
462+
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
463+
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
458464
);
459465
name = "[CP] Embed Pods Frameworks";
460466
outputPaths = (
467+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
468+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
461469
);
462470
runOnlyForDeploymentPostprocessing = 0;
463471
shellPath = /bin/sh;
@@ -485,9 +493,12 @@
485493
files = (
486494
);
487495
inputPaths = (
496+
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftWeather/Pods-SwiftWeather-frameworks.sh",
497+
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
488498
);
489499
name = "[CP] Embed Pods Frameworks";
490500
outputPaths = (
501+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
491502
);
492503
runOnlyForDeploymentPostprocessing = 0;
493504
shellPath = /bin/sh;
@@ -500,13 +511,16 @@
500511
files = (
501512
);
502513
inputPaths = (
514+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
515+
"${PODS_ROOT}/Manifest.lock",
503516
);
504517
name = "[CP] Check Pods Manifest.lock";
505518
outputPaths = (
519+
"$(DERIVED_FILE_DIR)/Pods-SwiftWeather-checkManifestLockResult.txt",
506520
);
507521
runOnlyForDeploymentPostprocessing = 0;
508522
shellPath = /bin/sh;
509-
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";
523+
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";
510524
showEnvVarsInLog = 0;
511525
};
512526
ADD0EBFC1C562E52002D8392 /* ShellScript */ = {
@@ -628,14 +642,20 @@
628642
CLANG_CXX_LIBRARY = "libc++";
629643
CLANG_ENABLE_MODULES = YES;
630644
CLANG_ENABLE_OBJC_ARC = YES;
645+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
631646
CLANG_WARN_BOOL_CONVERSION = YES;
647+
CLANG_WARN_COMMA = YES;
632648
CLANG_WARN_CONSTANT_CONVERSION = YES;
633649
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
634650
CLANG_WARN_EMPTY_BODY = YES;
635651
CLANG_WARN_ENUM_CONVERSION = YES;
636652
CLANG_WARN_INFINITE_RECURSION = YES;
637653
CLANG_WARN_INT_CONVERSION = YES;
654+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
655+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
638656
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
657+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
658+
CLANG_WARN_STRICT_PROTOTYPES = YES;
639659
CLANG_WARN_SUSPICIOUS_MOVE = YES;
640660
CLANG_WARN_UNREACHABLE_CODE = YES;
641661
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -658,7 +678,7 @@
658678
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
659679
GCC_WARN_UNUSED_FUNCTION = YES;
660680
GCC_WARN_UNUSED_VARIABLE = YES;
661-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
681+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
662682
MTL_ENABLE_DEBUG_INFO = YES;
663683
ONLY_ACTIVE_ARCH = YES;
664684
SDKROOT = iphoneos;
@@ -676,14 +696,20 @@
676696
CLANG_CXX_LIBRARY = "libc++";
677697
CLANG_ENABLE_MODULES = YES;
678698
CLANG_ENABLE_OBJC_ARC = YES;
699+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
679700
CLANG_WARN_BOOL_CONVERSION = YES;
701+
CLANG_WARN_COMMA = YES;
680702
CLANG_WARN_CONSTANT_CONVERSION = YES;
681703
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
682704
CLANG_WARN_EMPTY_BODY = YES;
683705
CLANG_WARN_ENUM_CONVERSION = YES;
684706
CLANG_WARN_INFINITE_RECURSION = YES;
685707
CLANG_WARN_INT_CONVERSION = YES;
708+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
709+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
686710
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
711+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
712+
CLANG_WARN_STRICT_PROTOTYPES = YES;
687713
CLANG_WARN_SUSPICIOUS_MOVE = YES;
688714
CLANG_WARN_UNREACHABLE_CODE = YES;
689715
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -700,7 +726,7 @@
700726
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
701727
GCC_WARN_UNUSED_FUNCTION = YES;
702728
GCC_WARN_UNUSED_VARIABLE = YES;
703-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
729+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
704730
MTL_ENABLE_DEBUG_INFO = NO;
705731
SDKROOT = iphoneos;
706732
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -720,7 +746,8 @@
720746
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
721747
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeather;
722748
PRODUCT_NAME = "$(TARGET_NAME)";
723-
SWIFT_VERSION = 3.0;
749+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
750+
SWIFT_VERSION = 4.0;
724751
};
725752
name = Debug;
726753
};
@@ -734,7 +761,8 @@
734761
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
735762
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeather;
736763
PRODUCT_NAME = "$(TARGET_NAME)";
737-
SWIFT_VERSION = 3.0;
764+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
765+
SWIFT_VERSION = 4.0;
738766
};
739767
name = Release;
740768
};
@@ -750,7 +778,8 @@
750778
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeatherTests;
751779
PRODUCT_NAME = "$(TARGET_NAME)";
752780
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
753-
SWIFT_VERSION = 3.0;
781+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
782+
SWIFT_VERSION = 4.0;
754783
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftWeather.app/SwiftWeather";
755784
};
756785
name = Debug;
@@ -766,7 +795,8 @@
766795
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
767796
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeatherTests;
768797
PRODUCT_NAME = "$(TARGET_NAME)";
769-
SWIFT_VERSION = 3.0;
798+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
799+
SWIFT_VERSION = 4.0;
770800
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftWeather.app/SwiftWeather";
771801
};
772802
name = Release;
@@ -779,7 +809,8 @@
779809
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
780810
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeatherUITests;
781811
PRODUCT_NAME = "$(TARGET_NAME)";
782-
SWIFT_VERSION = 3.0;
812+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
813+
SWIFT_VERSION = 4.0;
783814
TEST_TARGET_NAME = SwiftWeather;
784815
USES_XCTRUNNER = YES;
785816
};
@@ -793,7 +824,8 @@
793824
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
794825
PRODUCT_BUNDLE_IDENTIFIER = com.rushjet.SwiftWeatherUITests;
795826
PRODUCT_NAME = "$(TARGET_NAME)";
796-
SWIFT_VERSION = 3.0;
827+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
828+
SWIFT_VERSION = 4.0;
797829
TEST_TARGET_NAME = SwiftWeather;
798830
USES_XCTRUNNER = YES;
799831
};

0 commit comments

Comments
 (0)