Merge pull request #13 from polydice/feature/swift-5

Swift 5

Author: dlackty

.travis.yml

@@ -1,18 +1,20 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode10.3
 cache:
   bundler: true
   directories:
     - vendor/bundle
     - Pods
 before_install:
   - export LANG=en_US.UTF-8
+  - xcrun instruments -s devices
+  - xcrun instruments -w "Apple TV 4K (12.4)" || true
 install:
   - make bootstrap
 before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi
 script:
-  - bundle exec fastlane scan
+  - bundle exec fastlane scan --device "Apple TV 4K (12.4)"
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 notifications:

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Simpler project quick start [#6](https://github.com/polydice/iCook-tvOS/pull/6)
 * Replace Freddy with Swift Codable [#11](https://github.com/polydice/iCook-tvOS/pull/11)
 * Replace Quick and Nimble with XCTest [#12](https://github.com/polydice/iCook-tvOS/pull/12)
+* Swift 5 [#13](https://github.com/polydice/iCook-tvOS/pull/13)
 
 ## v1.0.0
 

Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "cocoapods", "1.3.1"
+gem "cocoapods"
 gem "cocoapods-keys"
 gem "danger"
 gem "fastlane"

Gemfile.lock

@@ -19,26 +19,26 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.3.1)
+    cocoapods (1.7.5)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.7.5)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.5)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -131,7 +131,7 @@ GEM
       xcodeproj (>= 1.8.1, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fourflusher (2.0.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.5.0)
@@ -176,7 +176,7 @@ GEM
     mime-types-data (3.2019.0331)
     mini_magick (4.9.5)
     minitest (5.11.3)
-    molinillo (0.5.7)
+    molinillo (0.6.6)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -245,7 +245,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.3.1)
+  cocoapods
   cocoapods-keys
   danger
   fastlane

Podfile

@@ -1,23 +1,23 @@
 source "https://github.com/CocoaPods/Specs.git"
 
-platform :tvos, "9.0"
+platform :tvos, "10.0"
 use_frameworks!
 inhibit_all_warnings!
 
 workspace "iCookTV"
 project "iCookTV"
 
 target :iCookTV do
-  pod "Alamofire", "~> 4.2.0"
+  pod "Alamofire", git: "https://github.com/Alamofire/Alamofire.git", tag: "4.8.2"
   pod "Crashlytics"
   pod "Fabric"
   pod "HCYoutubeParser"
-  pod "Hue", "~> 2.0.0"
-  pod "Kingfisher", "~> 3.2.0"
+  pod "Hue", git: "https://github.com/zenangst/Hue.git", tag: "5.0.0"
+  pod "Kingfisher", git: "https://github.com/onevcat/Kingfisher.git", tag: "5.7.0"
   pod "TreasureData-iOS-SDK", "0.1.15"
 
   target :iCookTVTests do
-    pod "SwiftLint", "0.24.0"
+    pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json"
   end
 end
 
@@ -27,12 +27,3 @@ plugin "cocoapods-keys", {
   keys: ["BaseAPIURL", "CrashlyticsAPIKey", "TreasureDataAPIKey"]
 }
 
-
-# Specify Swift version in the configs for all the pods installed.
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings["SWIFT_VERSION"] = "3.0"
-    end
-  end
-end

Podfile.lock

@@ -1,44 +1,74 @@
 PODS:
-  - Alamofire (4.2.0)
+  - Alamofire (4.8.2)
   - Crashlytics (3.8.3):
     - Fabric (~> 1.6.3)
   - Fabric (1.6.10)
   - HCYoutubeParser (0.0.5)
-  - Hue (2.0.1)
+  - Hue (5.0.0)
   - KeenClientTD (3.2.27)
   - Keys (1.0.1)
-  - Kingfisher (3.2.4)
-  - SwiftLint (0.24.0)
+  - Kingfisher (5.7.0)
+  - SwiftLint (0.34.0)
   - TreasureData-iOS-SDK (0.1.15):
     - KeenClientTD (= 3.2.27)
 
 DEPENDENCIES:
-  - Alamofire (~> 4.2.0)
+  - Alamofire (from `https://github.com/Alamofire/Alamofire.git`, tag `4.8.2`)
   - Crashlytics
   - Fabric
   - HCYoutubeParser
-  - Hue (~> 2.0.0)
+  - Hue (from `https://github.com/zenangst/Hue.git`, tag `5.0.0`)
   - Keys (from `Pods/CocoaPodsKeys`)
-  - Kingfisher (~> 3.2.0)
-  - SwiftLint (= 0.24.0)
+  - Kingfisher (from `https://github.com/onevcat/Kingfisher.git`, tag `5.7.0`)
+  - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json`)
   - TreasureData-iOS-SDK (= 0.1.15)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Crashlytics
+    - Fabric
+    - HCYoutubeParser
+    - KeenClientTD
+    - TreasureData-iOS-SDK
+
 EXTERNAL SOURCES:
+  Alamofire:
+    :git: https://github.com/Alamofire/Alamofire.git
+    :tag: 4.8.2
+  Hue:
+    :git: https://github.com/zenangst/Hue.git
+    :tag: 5.0.0
   Keys:
     :path: Pods/CocoaPodsKeys
+  Kingfisher:
+    :git: https://github.com/onevcat/Kingfisher.git
+    :tag: 5.7.0
+  SwiftLint:
+    :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json
+
+CHECKOUT OPTIONS:
+  Alamofire:
+    :git: https://github.com/Alamofire/Alamofire.git
+    :tag: 4.8.2
+  Hue:
+    :git: https://github.com/zenangst/Hue.git
+    :tag: 5.0.0
+  Kingfisher:
+    :git: https://github.com/onevcat/Kingfisher.git
+    :tag: 5.7.0
 
 SPEC CHECKSUMS:
-  Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
   Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
   Fabric: c73f371ee543e3f0b80608f2674750e4910d1669
   HCYoutubeParser: bc1db8c062e4b835eda381f2be2f9970f6a8d071
-  Hue: 354caec055fdc9d38b5ef33ca2e7224721843baf
+  Hue: c129cb67be7d093a82bbbc30ce8a96757bf6f37a
   KeenClientTD: ddb29a702bd4cfce5d526519ca8959d70c324c6a
   Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
-  Kingfisher: 8d80f39da403cd9c9ee11984e1655f4d6a566cdb
-  SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
+  Kingfisher: 5e1c7784a4e1052c2ed2f22dd4b19b1db74c837e
+  SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
   TreasureData-iOS-SDK: cc878af36b85ae3540a9a5bdb36b7bdc8707b719
 
-PODFILE CHECKSUM: e5951c6489057187d3b6c52cfcfe304dc59eb489
+PODFILE CHECKSUM: 7d0f309956943494904766e181472b47d17e9494
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.7.5

README.md

@@ -1,30 +1,22 @@
 # iCook tvOS App
 
 [![Build Status](https://travis-ci.org/polydice/iCook-tvOS.svg)](https://travis-ci.org/polydice/iCook-tvOS)
+![Swift 5](https://img.shields.io/badge/Swift-5-orange.svg)
 [![codecov.io](https://codecov.io/github/polydice/iCook-tvOS/coverage.svg?branch=develop)](https://codecov.io/github/polydice/iCook-tvOS?branch=develop)
-![Swift 3.2](https://img.shields.io/badge/Swift-3.2-orange.svg)
 
 A tvOS app that plays [iCook TV](https://tv.icook.tw/) videos.
 
 <img src="https://polydice.github.io/iCook-tvOS/images/Screenshot.png" width=800px>
 
-## Setup
-
-Install [Bundler](http://bundler.io/):
-
-```
-gem install bundler
-```
-
-### Quick Start
+## Quick Start
 
 Run the following commands to install dependencies:
 
 ```
 make bootstrap
 ```
 
-### Production Setups
+## Production Setups
 
 If you work at Polydice, instead of `make bootstrap`, set up the project step by step with the following commands. Fill in the credentials and ask admin for required files.
 
@@ -63,10 +55,6 @@ Managed by CocoaPods-Keys:
 
 * `icook-tv-top-shelf-image.png` is not included in the repo due to the license of image.
 
-## Known Issues
-
-* Initializing generic `DataSource` will cause `EXC_BAD_ACCESS` in Xcode 8. Fixed in Xcode 8.1.
-
 ## Demo
 
 * Install the beta version via <https://testflight.icook.tw>.