Merge branch 'feature/update-dependencies' into develop

Author: bcylin

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.1
+osx_image: xcode8.2
 cache:
   bundler: true
   directories:
@@ -15,7 +15,7 @@ install:
 before_script:
   - bundle exec danger
 script:
-  - bundle exec scan
+  - bundle exec fastlane scan
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 notifications:

Gemfile

@@ -4,5 +4,5 @@ ruby "2.3.1"
 gem "cocoapods", "~> 1.1.0"
 gem "cocoapods-keys"
 gem "danger", "~> 4.0.0"
-gem "scan"
+gem "fastlane"
 gem "slather"

Gemfile.lock

@@ -11,7 +11,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    babosa (1.0.2)
     claide (1.0.1)
     claide-plugins (0.9.2)
       cork
@@ -41,29 +43,24 @@ GEM
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.2)
+    cocoapods-downloader (1.1.3)
     cocoapods-keys (1.7.0)
       dotenv
       osx_keychain
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.1)
+    cocoapods-trunk (1.1.2)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
-    commander (4.4.0)
+    commander (4.4.3)
       highline (~> 1.7.2)
     cork (0.2.0)
       colored (~> 1.2)
-    credentials_manager (0.16.2)
-      colored
-      commander (>= 4.3.5)
-      highline (>= 1.7.1)
-      security
-    danger (4.0.1)
+    danger (4.0.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored (~> 1.2)
@@ -74,79 +71,149 @@ GEM
       kramdown (~> 1.5)
       octokit (~> 4.2)
       terminal-table (~> 1)
+    domain_name (0.5.20161129)
+      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.1.1)
     escape (0.0.4)
     excon (0.54.0)
-    faraday (0.9.2)
+    faraday (0.10.0)
       multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
-    fastlane_core (0.57.2)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.0.1)
+      addressable (~> 2)
+    fastlane (2.3.0)
+      activesupport (< 5)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (~> 1.12)
       colored
-      commander (>= 4.4.0, <= 5.0.0)
-      credentials_manager (>= 0.16.2, < 1.0.0)
-      excon (>= 0.45.0, < 1.0)
+      commander (>= 4.4.0, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 1.6)
       gh_inspector (>= 1.0.1, < 2.0.0)
-      highline (>= 1.7.2)
-      json
+      google-api-client (~> 0.9.1)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      mini_magick (~> 4.5.1)
       multi_json
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
-      rubyzip (~> 1.1.6)
+      rubyzip (>= 1.1.0, < 2.0.0)
+      security (= 0.1.3)
+      slack-notifier (>= 1.3, < 2.0.0)
+      terminal-notifier (>= 1.6.2, < 2.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 0.20, < 2.0.0)
+      xcpretty (>= 0.2.4, < 1.0.0)
+      xcpretty-travis-formatter (>= 0.0.3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.2)
     git (1.3.0)
+    google-api-client (0.9.20)
+      addressable (~> 2.3)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
     highline (1.7.8)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    hurley (0.2)
     i18n (0.7.0)
     json (1.8.3)
+    jwt (1.5.6)
     kramdown (1.13.1)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.15.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_magick (4.5.1)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     molinillo (0.5.4)
     multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    octokit (4.4.1)
-      sawyer (~> 0.7.0, >= 0.5.3)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    os (0.9.6)
     osx_keychain (1.0.1)
       RubyInline (~> 3)
     plist (3.2.0)
+    public_suffix (2.0.4)
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    retriable (2.1.0)
     rouge (1.11.1)
-    rubyzip (1.1.7)
-    sawyer (0.7.0)
-      addressable (>= 2.3.5, < 2.5)
-      faraday (~> 0.8, < 0.10)
-    scan (0.14.2)
-      fastlane_core (>= 0.57.0, < 1.0.0)
-      slack-notifier (~> 1.3)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      xcpretty (>= 0.2.4, < 1.0.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+    rubyzip (1.2.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
     security (0.1.3)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
     slack-notifier (1.5.1)
     slather (2.3.0)
       activesupport (>= 4.0.2, < 5)
       clamp (~> 0.6)
       nokogiri (~> 1.6.3)
       xcodeproj (>= 0.20, < 2.0.0)
+    terminal-notifier (1.7.1)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
-    xcodeproj (1.4.1)
+    uber (0.0.15)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.1.2)
+    word_wrap (1.0.0)
+    xcodeproj (1.4.2)
       CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
       claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
-      nanaimo (~> 0.2.0)
+      nanaimo (~> 0.2.3)
     xcpretty (0.2.4)
       rouge (~> 1.8)
     xcpretty-travis-formatter (0.0.4)
@@ -159,7 +226,7 @@ DEPENDENCIES
   cocoapods (~> 1.1.0)
   cocoapods-keys
   danger (~> 4.0.0)
-  scan
+  fastlane
   slather
 
 RUBY VERSION

Podfile

@@ -9,19 +9,19 @@ workspace "iCookTV"
 project "iCookTV"
 
 target :iCookTV do
-  pod "Alamofire", "~> 4.0.0"
+  pod "Alamofire", "~> 4.2.0"
   pod "Crashlytics"
   pod "Fabric"
   pod "Freddy", "~> 3.0.0"
   pod "HCYoutubeParser"
   pod "Hue", "~> 2.0.0"
-  pod "R.swift", "~> 3.0.0"
-  pod "Kingfisher", "~> 3.1.0"
+  pod "R.swift", "~> 3.2.0"
+  pod "Kingfisher", "~> 3.2.0"
   pod "TreasureData-tvOS-SDK", "0.1.14"
 
   target :iCookTVTests do
-    pod "Nimble", "~> 5.0.0"
-    pod "Quick", "~> 0.10.0"
+    pod "Nimble"
+    pod "Quick"
   end
 end
 

Podfile.lock

@@ -1,56 +1,56 @@
 PODS:
-  - Alamofire (4.0.1)
+  - Alamofire (4.2.0)
   - Crashlytics (3.8.3):
     - Fabric (~> 1.6.3)
   - Fabric (1.6.10)
   - Freddy (3.0.0)
   - HCYoutubeParser (0.0.5)
-  - Hue (2.0.0)
+  - Hue (2.0.1)
   - KeenClientTD (3.2.25)
   - Keys (1.0.0)
-  - Kingfisher (3.1.4)
-  - Nimble (5.0.0)
-  - Quick (0.10.0)
-  - R.swift (3.0.0):
-    - R.swift.Library (~> 3.0.0)
+  - Kingfisher (3.2.4)
+  - Nimble (5.1.1)
+  - Quick (1.0.0)
+  - R.swift (3.2.0):
+    - R.swift.Library (~> 3.0.2)
   - R.swift.Library (3.0.2)
   - TreasureData-tvOS-SDK (0.1.14):
     - KeenClientTD (= 3.2.25)
 
 DEPENDENCIES:
-  - Alamofire (~> 4.0.0)
+  - Alamofire (~> 4.2.0)
   - Crashlytics
   - Fabric
   - Freddy (~> 3.0.0)
   - HCYoutubeParser
   - Hue (~> 2.0.0)
   - Keys (from `Pods/CocoaPodsKeys`)
-  - Kingfisher (~> 3.1.0)
-  - Nimble (~> 5.0.0)
-  - Quick (~> 0.10.0)
-  - R.swift (~> 3.0.0)
+  - Kingfisher (~> 3.2.0)
+  - Nimble
+  - Quick
+  - R.swift (~> 3.2.0)
   - TreasureData-tvOS-SDK (= 0.1.14)
 
 EXTERNAL SOURCES:
   Keys:
     :path: Pods/CocoaPodsKeys
 
 SPEC CHECKSUMS:
-  Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
+  Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
   Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
   Fabric: c73f371ee543e3f0b80608f2674750e4910d1669
   Freddy: 367f994c88a90dd3987293b4b1bec94a4530745a
   HCYoutubeParser: bc1db8c062e4b835eda381f2be2f9970f6a8d071
-  Hue: 2b317616a04cc5d7cccdb024c88e6d143e2b9cf1
+  Hue: 354caec055fdc9d38b5ef33ca2e7224721843baf
   KeenClientTD: ffe8b9a67e71643f59a9fda7ce51941ed5c49a42
   Keys: 9c35bf00f612ee1d48556f4a4b9b4551e224e90f
-  Kingfisher: 6c67e3e57f2d81a9cfdfa25052cd86f33ceac9bb
-  Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
-  Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
-  R.swift: 5a8b4a4ea565b0f20c39d8ce1445f3d3a9064768
+  Kingfisher: 8d80f39da403cd9c9ee11984e1655f4d6a566cdb
+  Nimble: 415e3aa3267e7bc2c96b05fa814ddea7bb686a29
+  Quick: 8024e4a47e6cc03a9d5245ef0948264fc6d27cff
+  R.swift: 207a372a2b5977caef440c696a368009460641d1
   R.swift.Library: fbdec16c9802ad104fc1ba53415dc190e6ec5c73
   TreasureData-tvOS-SDK: 18c6a68471e6df592ed5c50bf2c07507ee6e3b77
 
-PODFILE CHECKSUM: 4641568721dea925a2fe6eb5ca81abcd47371e7d
+PODFILE CHECKSUM: 474e81b3e6412474272b160b7bf8ef5105774c9b
 
 COCOAPODS: 1.1.1

Scanfile renamed to fastlane/Scanfile

@@ -7,6 +7,6 @@
 workspace "iCookTV.xcworkspace"
 scheme "iCookTV"
 clean true
+skip_build true
 code_coverage true
-destination "name=Apple TV 1080p,OS=latest"
 output_types "junit"

iCookTV/Controllers/HistoryViewController.swift

@@ -86,7 +86,7 @@ class HistoryViewController: UIViewController,
       } catch {
         Tracker.track(error)
         // Remove the malformed cache.
-        HistoryManager.deleteCache() { _ in
+        HistoryManager.deleteCache { _ in
           self.isLoading = false
         }
       }

iCookTV/Views/CategoryCell.swift

@@ -124,9 +124,7 @@ class CategoryCell: UICollectionViewCell {
     }
 
     for (grid, url) in urls {
-      let downloading = ImageDownloader.default.downloadImage(with: url, progressBlock: nil) {
-        [weak self] image, error, imageURL, originalData in
-
+      let downloading = ImageDownloader.default.downloadImage(with: url, progressBlock: nil) { [weak self] image, _, imageURL, _ in
         self?.tasks[grid] = nil
         guard let image = image, imageURL == url else {
           return

scripts/swiftlint.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SWIFTLINT_VERSION="0.13.2"
+SWIFTLINT_VERSION="0.15.0"
 
 if ! command -v swiftlint >/dev/null; then
   brew install swiftlint