Merge branch 'release/1.5.1'

FrostlightSolutions · Sep 12, 2019 · 39de5bb · 39de5bb
2 parents 67112ea + 1d5910c
commit 39de5bb
Show file tree

Hide file tree

Showing 50 changed files with 612 additions and 232 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,12 @@
-# Mac OS X
-.DS_Store
-
 # Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+*.DS_Store
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -16,41 +17,29 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
 
 ## Playgrounds
 timeline.xctimeline
 playground.xcworkspace
 
-# Swift Package Manager
+## Swift Package Manager
+Packages/
+Package.pins
+Package.resolved
 .build/
 
-# Carthage
+## Carthage
+Carthage/Checkouts
 Carthage/Build
-
-# Fastlane
-
-# fastlane specific
-fastlane/report.xml
-
-# deliver temporary files
-fastlane/Preview.html
-
-# snapshot generated screenshots
-fastlane/screenshots
-
-# scan temporary files
-fastlane/test_output
-
-# Swift performance report
-culprits.txt
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10.2
+osx_image: xcode11
 branches:
   only:
     - master
@@ -16,17 +16,17 @@ env:
   - EXAMPLE_PROJECT="iOS Example.xcodeproj"
   - EXAMPLE_SCHEME="iOS Example"
   matrix:
-    - DESTINATION="OS=5.2,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=6.0,name=Apple Watch Series 5 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=5.1,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO"
     - DESTINATION="OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO"
 
-    - DESTINATION="OS=12.2,name=iPhone XS"       SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
-    - DESTINATION="OS=11.4,name=iPhone X"        SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
-    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
+    - DESTINATION="OS=13.0,name=iPhone 11"         SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
+    - DESTINATION="OS=12.1,name=iPhone 11 Pro"     SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
+    - DESTINATION="OS=11.4,name=iPhone 11 Pro Max" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES"
 
-    - DESTINATION="OS=12.2,name=Apple TV 4K"    SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
-    - DESTINATION="OS=11.4,name=Apple TV 4K"    SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=13.0,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=12.1,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=11.4,name=Apple TV"    SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
 
     - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"
 script:
@@ -36,10 +36,8 @@ script:
 
   # Build Framework in Release and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
     else
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
 

diff --git a/FrostKit iOS Tests/Extensions/DateExtensionsTests.swift b/FrostKit iOS Tests/Extensions/DateExtensionsTests.swift
@@ -539,30 +539,4 @@ class DateExtensionsTests: XCTestCase {
         }
     }
 
-    func testDateStrings() {
-
-        var components = DateComponents()
-        components.calendar = Calendar.iso8601
-        components.timeZone = TimeZone.utc
-        components.year = 2016
-        components.month = 2
-        components.day = 26
-        components.hour = 19
-        components.minute = 12
-        components.second = 43
-        let date = components.date!
-
-        XCTAssert(date.dateTimeShortString == DateFormatter.localizedString(from: date, dateStyle: .short, timeStyle: .short))
-        XCTAssert(date.dateShortString == DateFormatter.localizedString(from: date, dateStyle: .short, timeStyle: .none))
-        XCTAssert(date.dateMediumString == DateFormatter.localizedString(from: date, dateStyle: .medium, timeStyle: .none))
-        XCTAssert(date.dateFullString == DateFormatter.localizedString(from: date, dateStyle: .full, timeStyle: .none))
-        XCTAssert(date.timeShortString == DateFormatter.localizedString(from: date, dateStyle: .none, timeStyle: .short))
-        XCTAssert(date.fusDateString == "2016-02-26")
-        XCTAssert(date.fusDateTimeString == "2016-02-26T20:12:43.000000Z")
-        XCTAssert(date.dayString == "Friday")
-        XCTAssert(date.dayShortString == "Fri")
-        XCTAssert(date.monthString == "February")
-        XCTAssert(date.monthShortString == "Feb")
-        XCTAssert(date.yearString == "2016")
-    }
 }
diff --git a/FrostKit iOS Tests/Helpers/AppStoreHelperTests.swift b/FrostKit iOS Tests/Helpers/AppStoreHelperTests.swift
@@ -27,11 +27,12 @@ class AppStoreHelperTests: XCTestCase {
 
         FrostKit.setup(appStoreID: "538357667")
 
-        AppStoreHelper.shared.updateAppStoreData { (error) in
+        AppStoreHelper.shared.updateAppStoreData { result in
 
-            if let anError = error {
-                XCTAssert(false, "App Store Detail Update Error: \(anError.localizedDescription)")
-            } else {
+            switch result {
+            case .failure(let error):
+                XCTAssert(false, "App Store Detail Update Error: \(error.localizedDescription)")
+            case .success:
                 XCTAssert(true, "App Store Details Updated")
             }
             expectation.fulfill()