Merge branch 'release/1.5.0'

FrostlightSolutions · Mar 25, 2019 · 5fc568f · 5fc568f
2 parents cd2ee5b + 08413df
commit 5fc568f
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 37 deletions.
diff --git a/FrostKit iOS Tests/Helpers/AppStoreHelperTests.swift b/FrostKit iOS Tests/Helpers/AppStoreHelperTests.swift
@@ -25,7 +25,7 @@ class AppStoreHelperTests: XCTestCase {
 
         let expectation = self.expectation(description: "Test App Store Update")
 
-        FrostKit.setup(appStoreID: "571254467")
+        FrostKit.setup(appStoreID: "538357667")
 
         AppStoreHelper.shared.updateAppStoreData { (error) in
 

diff --git a/FrostKit.xcodeproj/project.pbxproj b/FrostKit.xcodeproj/project.pbxproj
@@ -886,17 +886,17 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "James Barrow - Frostlight Solutions";
 				TargetAttributes = {
 					1826B0251BD9047900DA1669 = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					1829A80B1BA2CD380017E4EE = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					1836A20B1A84414D00E57F86 = {
@@ -907,29 +907,29 @@
 					};
 					18839B1619D9FA8C00760157 = {
 						CreatedOnToolsVersion = 6.0.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					18839B2119D9FA8C00760157 = {
 						CreatedOnToolsVersion = 6.0.1;
 						DevelopmentTeam = 6WJM49JAZT;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					18D54BE81CE6439300D365C6 = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 6WJM49JAZT;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					18E5459C1C77E53F00637E85 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					18E545A51C77E54000637E85 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 					18F3194D1E45F7B80055E647 = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -940,10 +940,11 @@
 			};
 			buildConfigurationList = 18839B1119D9FA8C00760157 /* Build configuration list for PBXProject "FrostKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 18839B0D19D9FA8C00760157;
 			productRefGroup = 18839B1819D9FA8C00760157 /* Products */;
@@ -1374,7 +1375,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1404,7 +1405,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1431,7 +1432,7 @@
 				PRODUCT_NAME = FrostKit;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -1459,7 +1460,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -1497,6 +1498,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1556,6 +1558,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1629,7 +1632,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = singlefile;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1657,7 +1660,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1676,7 +1679,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.Frostlight.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1692,7 +1695,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1710,7 +1713,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.PigonaHill.FrostKit-tvOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Debug;
@@ -1731,7 +1734,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 			};
 			name = Release;
@@ -1760,7 +1763,7 @@
 				PRODUCT_NAME = FrostKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1790,7 +1793,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1808,7 +1811,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.PigonaHill.FrostKit-macOS-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1828,7 +1831,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit iOS.xcscheme b/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit macOS.xcscheme b/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit tvOS.xcscheme b/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit watchOS.xcscheme b/FrostKit.xcodeproj/xcshareddata/xcschemes/FrostKit watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FrostKit/Extensions/CKContainerExtensions.swift b/FrostKit/Extensions/CKContainerExtensions.swift
@@ -11,7 +11,7 @@ import CloudKit
 @available(watchOSApplicationExtension 3.0, *)
 public extension CKContainer {
 
-    public func fetchUserRecord(desiredKeys: [String]? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
+    func fetchUserRecord(desiredKeys: [String]? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
 
         fetchUserRecordID { (recordID, error) in
 
@@ -45,11 +45,11 @@ public extension CKContainer {
         }
     }
 
-    public func update(userRecord: CKRecord, progressHandler: ((Double) -> Void)? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
+    func update(userRecord: CKRecord, progressHandler: ((Double) -> Void)? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
         publicCloudDatabase.save(userRecord, progressHandler: progressHandler, completionHandler: completionHandler)
     }
 
-    public func update(userRecordWithObject object: CKRecordValue?, key: String, progressHandler: ((Double) -> Void)? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
+    func update(userRecordWithObject object: CKRecordValue?, key: String, progressHandler: ((Double) -> Void)? = nil, completionHandler: @escaping (CKRecord?, Error?) -> Void) {
 
         fetchUserRecord(desiredKeys: []) { (record, error) in
 

diff --git a/FrostKit/Extensions/CKRecordIDExtensions.swift b/FrostKit/Extensions/CKRecordIDExtensions.swift
@@ -12,7 +12,7 @@ import CloudKit
 @available(watchOSApplicationExtension 3.0, *)
 public extension CKRecord.ID {
 
-    public class func recordIDs(fromRecordNames names: [String], zoneID: CKRecordZone.ID? = nil) -> [CKRecord.ID] {
+    class func recordIDs(fromRecordNames names: [String], zoneID: CKRecordZone.ID? = nil) -> [CKRecord.ID] {
         return names.map({ (name) -> CKRecord.ID in
             let recordID: CKRecord.ID
             if let recordZoneID = zoneID {

diff --git a/FrostKit/Extensions/CKReferenceExntensions.swift b/FrostKit/Extensions/CKReferenceExntensions.swift
@@ -12,13 +12,13 @@ import CloudKit
 @available(watchOSApplicationExtension 3.0, *)
 public extension CKRecord.Reference {
 
-    public class func references(fromRecordIDs recordIDs: [CKRecord.ID], action: CKRecord.Reference.Action = .none) -> [CKRecord.Reference] {
+    class func references(fromRecordIDs recordIDs: [CKRecord.ID], action: CKRecord.Reference.Action = .none) -> [CKRecord.Reference] {
         return recordIDs.map({ (recordID) -> CKRecord.Reference in
             return CKRecord.Reference(recordID: recordID, action: action)
         })
     }
 
-    public class func references(fromRecordNames names: [String], zoneID: CKRecordZone.ID? = nil, action: CKRecord.Reference.Action = .none) -> [CKRecord.Reference] {
+    class func references(fromRecordNames names: [String], zoneID: CKRecordZone.ID? = nil, action: CKRecord.Reference.Action = .none) -> [CKRecord.Reference] {
         return names.map({ (name) -> CKRecord.Reference in
             let recordID: CKRecord.ID
             if let recordZoneID = zoneID {

diff --git a/FrostKit/Extensions/CollectionViewControllerExtensions.swift b/FrostKit/Extensions/CollectionViewControllerExtensions.swift
@@ -14,7 +14,7 @@ import UIKit
 public extension UICollectionViewController {
 
     /// Allows easy access to a collection view controller's refrsh control the same way as in a table view controller.
-    public var refreshControl: UIRefreshControl? {
+    var refreshControl: UIRefreshControl? {
         get {
             if #available(iOS 10, *) {
                 return collectionView?.refreshControl

diff --git a/FrostKit/Helpers/AppStoreHelper.swift b/FrostKit/Helpers/AppStoreHelper.swift
@@ -97,7 +97,7 @@ public class AppStoreHelper {
             } else if let jsonData = data {
 
                 guard let json = try? JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any],
-                    let results = json?["results"] as? [[String: Any]],
+                    let results = json["results"] as? [[String: Any]],
                     let appDetails = results.first else {
 
                     DispatchQueue.main.async {

diff --git a/FrostKit/Helpers/SocialHelper.swift b/FrostKit/Helpers/SocialHelper.swift
@@ -233,6 +233,8 @@ public class SocialHelper: NSObject, UINavigationControllerDelegate, MFMailCompo
             } else {
                 DLog("Email send failed!")
             }
+        @unknown default:
+            break
         }
 
         controller.dismiss(animated: true, completion: nil)
@@ -249,6 +251,8 @@ public class SocialHelper: NSObject, UINavigationControllerDelegate, MFMailCompo
             DLog("Message sent")
         case .failed:
             DLog("Message failed")
+        @unknown default:
+            break
         }
 
         controller.dismiss(animated: true, completion: nil)

diff --git a/FrostKit/Info.plist b/FrostKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/FrostKit/Maps/MapController.swift b/FrostKit/Maps/MapController.swift
@@ -637,6 +637,8 @@ open class MapController: NSObject, MKMapViewDelegate, CLLocationManagerDelegate
             trackingUser = false
         case .follow, .followWithHeading:
             trackingUser = true
+        @unknown default:
+            break
         }
     }