Merge pull request #4 from stefanrenne/feature/swift5

Swift 5
RuudPuts · Jul 20, 2019 · b55578c · b55578c
2 parents 69b449c + 3cd916b
commit b55578c
Show file tree

Hide file tree

Showing 41 changed files with 653 additions and 534 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: swift
 os: osx
-osx_image: xcode10.1
+osx_image: xcode10.2
 cache:
   directories:
   - Pods
@@ -12,15 +12,15 @@ env:
   - SCHEME=Down
   - CC_TEST_REPORTER_ID=4074485b984af5323f0806408b43441628bc6f72f523b89c5338f87ae807820a
   matrix:
-    - DESTINATION="OS=12.1,name=iPhone XS"
+    - DESTINATION="platform=iOS Simulator,name=iPhone XS"
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
   - whoami
 before_install:
   - gem install activesupport -N
-  - gem install slather --no-rdoc
+  - gem install slather
   - pod install --repo-update
 script:
   - fastlane test

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

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

diff --git a/Down/Download/Item details/DownloadItemDetailViewController.swift b/Down/Download/Item details/DownloadItemDetailViewController.swift
@@ -13,8 +13,7 @@ import Kingfisher
 
 import RxSwift
 import RxCocoa
-import Result
-import RxResult
+
 
 class DownloadItemDetailViewController: UIViewController & Depending {
     typealias Dependencies = RouterDependency
@@ -167,14 +166,14 @@ extension DownloadItemDetailViewController: ReactiveBinding {
             .disposed(by: disposeBag)
     }
 
-    private func bindItemDeleted(_ itemDeleted: Observable<Result<Void, DownError>>) {
+    private func bindItemDeleted(_ itemDeleted: Observable<Swift.Result<Void, DownError>>) {
         itemDeleted
             .do(
-                onSuccess: {
+                onSuccess: { _ in
                     self.dependencies.router.close(viewController: self)
                 },
-                onFailure: {
-                    self.dependencies.errorHandler.handle(error: $0,
+                onFailure: { error in
+                    self.dependencies.errorHandler.handle(error: error,
                                                           action: .download_deleteItem,
                                                           source: self)
                 }

diff --git a/Down/Download/Item details/DownloadItemDetailViewModel.swift b/Down/Download/Item details/DownloadItemDetailViewModel.swift
@@ -10,7 +10,6 @@ import UIKit
 import DownKit
 import RxSwift
 import RxCocoa
-import Result
 
 struct DownloadItemDetailViewModel: Depending {
     typealias Dependencies = DownloadInteractorFactoryDependency & DvrRequestBuilderDependency
@@ -34,7 +33,7 @@ extension DownloadItemDetailViewModel: ReactiveBindable {
 
     struct Output {
         let refinedItem: Driver<RefinedItem>
-        let itemDeleted: Observable<Result<Void, DownError>>
+        let itemDeleted: Observable<Swift.Result<Void, DownError>>
     }
 }
 

diff --git a/Down/Download/Overview/DownloadStatusViewController.swift b/Down/Download/Overview/DownloadStatusViewController.swift
@@ -11,7 +11,7 @@ import DownKit
 
 import RxSwift
 import RxCocoa
-import RxResult
+
 
 class DownloadStatusViewController: UIViewController & Depending {
     typealias Dependencies = DownloadStatusTableController.Dependencies
@@ -210,7 +210,7 @@ extension DownloadStatusViewController: ReactiveBinding {
 
         actions.forEach { data in
             data.observable
-                .subscribeResult(onFailure: {
+                .subscribe(onFailure: {
                     self.dependencies.errorHandler.handle(error: $0, action: data.action, source: self)
                 })
                 .disposed(by: disposeBag)

diff --git a/Down/Download/Overview/DownloadStatusViewModel.swift b/Down/Download/Overview/DownloadStatusViewModel.swift
@@ -9,8 +9,7 @@
 import DownKit
 import RxSwift
 import RxCocoa
-import Result
-import RxResult
+
 
 struct DownloadStatusViewModel: Depending {
     typealias Dependencies = DownloadInteractorFactoryDependency & DownloadApplicationDependency
@@ -21,7 +20,7 @@ struct DownloadStatusViewModel: Depending {
     var input = Input()
     lazy var output = transform(input: input)
 
-    fileprivate let refreshInterval: TimeInterval = 2
+    fileprivate let refreshInterval: RxTimeInterval = .seconds(2)
 
     init(dependencies: Dependencies) {
         self.dependencies = dependencies
@@ -41,9 +40,9 @@ extension DownloadStatusViewModel: ReactiveBindable {
         let sectionsData: Driver<[TableSectionData<DownloadItem>]>
         let itemSelected: Observable<DownloadItem>
 
-        let queuePaused: Observable<Result<Bool, DownError>>
-        let queueResumed: Observable<Result<Bool, DownError>>
-        let historyPurged: Observable<Result<Bool, DownError>>
+        let queuePaused: Observable<Swift.Result<Bool, DownError>>
+        let queueResumed: Observable<Swift.Result<Bool, DownError>>
+        let historyPurged: Observable<Swift.Result<Bool, DownError>>
     }
 }
 
@@ -91,13 +90,13 @@ extension DownloadStatusViewModel {
             .asDriver(onErrorJustReturn: DownloadQueue())
     }
 
-    private func makePauseQueueInteractor() -> Observable<Result<Bool, DownError>> {
+    private func makePauseQueueInteractor() -> Observable<Swift.Result<Bool, DownError>> {
         return dependencies.downloadInteractorFactory
             .makePauseQueueInteractor(for: dependencies.downloadApplication)
             .observeResult()
     }
 
-    private func makeResumeQueueInteractor() -> Observable<Result<Bool, DownError>> {
+    private func makeResumeQueueInteractor() -> Observable<Swift.Result<Bool, DownError>> {
         return dependencies.downloadInteractorFactory
             .makeResumeQueueInteractor(for: dependencies.downloadApplication)
             .observeResult()
@@ -112,7 +111,7 @@ extension DownloadStatusViewModel {
             .asDriver(onErrorJustReturn: [])
     }
 
-    private func makePurgeHistoryInteractor() -> Observable<Result<Bool, DownError>> {
+    private func makePurgeHistoryInteractor() -> Observable<Swift.Result<Bool, DownError>> {
         return dependencies.downloadInteractorFactory
             .makePurgeHistoryInteractor(for: dependencies.downloadApplication)
             .observeResult()

diff --git a/Down/Dvr/Add Show/DvrAddShowViewController.swift b/Down/Dvr/Add Show/DvrAddShowViewController.swift
@@ -12,7 +12,7 @@ import SkyFloatingLabelTextField
 import DownKit
 import RxSwift
 import RxCocoa
-import RxResult
+
 
 class DvrAddShowViewController: UIViewController & Depending {
     let dependencies: Dependencies

diff --git a/Down/Dvr/Add Show/DvrAddShowViewModel.swift b/Down/Dvr/Add Show/DvrAddShowViewModel.swift
@@ -9,8 +9,7 @@
 import DownKit
 import RxSwift
 import RxCocoa
-import Result
-import RxResult
+
 
 struct DvrAddShowViewModel: Depending {
     typealias Dependencies = DvrApplicationDependency & DvrInteractorFactoryDependency
@@ -37,7 +36,7 @@ extension DvrAddShowViewModel: ReactiveBindable {
     struct Output {
         let searchResults: Observable<[DvrShow]>
         let addingShow: Observable<DvrShow>
-        let showAdded: Observable<Result<DvrShow, DownError>>
+        let showAdded: Observable<Swift.Result<DvrShow, DownError>>
     }
 }
 

diff --git a/Down/Dvr/Show details/DvrEpisodeCell.swift b/Down/Dvr/Show details/DvrEpisodeCell.swift
@@ -147,7 +147,7 @@ extension DvrEpisodeCell: ReactiveBinding {
             .disposed(by: disposeBag)
 
         output.plotFetched
-            .delay(0.1, scheduler: MainScheduler.instance)
+            .delay(.milliseconds(100), scheduler: MainScheduler.instance)
             .do(onNext: { _ in
                 DispatchQueue.main.async {
                     self.setNeedsLayout()
@@ -160,7 +160,7 @@ extension DvrEpisodeCell: ReactiveBinding {
 
     private func bindStatusChanged(_ output: DvrEpisodeCellModel.Output) {
         output.statusChanged
-            .subscribeResult(onFailure: {
+            .subscribe(onFailure: {
                 guard let context = self.context else {
                     return
                 }

diff --git a/Down/Dvr/Show details/DvrEpisodeCellModel.swift b/Down/Dvr/Show details/DvrEpisodeCellModel.swift
@@ -10,7 +10,6 @@ import DownKit
 import RxSwift
 import RxCocoa
 import RxRealm
-import Result
 
 struct DvrEpisodeCellModel: Depending {
     typealias Dependencies = DvrInteractorFactoryDependency
@@ -43,7 +42,7 @@ extension DvrEpisodeCellModel: ReactiveBindable {
     struct Output {
         let episode: Observable<RefinedEpisode>
         let plotFetched: Observable<Void>
-        let statusChanged: Observable<Result<Void, DownError>>
+        let statusChanged: Observable<Swift.Result<Void, DownError>>
     }
 }
 

diff --git a/Down/Dvr/Show details/DvrSeasonHeaderViewModel.swift b/Down/Dvr/Show details/DvrSeasonHeaderViewModel.swift
@@ -10,7 +10,6 @@ import DownKit
 import RxSwift
 import RxCocoa
 import RxRealm
-import Result
 
 struct DvrSeasonTableHeaderViewModel: Depending {
     typealias Dependencies = DvrInteractorFactoryDependency
@@ -41,7 +40,7 @@ extension DvrSeasonTableHeaderViewModel: ReactiveBindable {
 
     struct Output {
         let season: Observable<RefinedSeason>
-        let statusChanged: Observable<Result<Void, DownError>>
+        let statusChanged: Observable<Swift.Result<Void, DownError>>
     }
 }
 

diff --git a/Down/Dvr/Show details/DvrSeasonTableHeaderView.swift b/Down/Dvr/Show details/DvrSeasonTableHeaderView.swift
@@ -70,7 +70,7 @@ extension DvrSeasonTableHeaderView: ReactiveBinding {
             .disposed(by: disposeBag)
 
         output.statusChanged
-            .subscribeResult(onFailure: {
+            .subscribe(onFailure: {
                 guard let context = self.context else {
                     return
                 }

diff --git a/Down/Dvr/Show details/DvrShowDetailViewController.swift b/Down/Dvr/Show details/DvrShowDetailViewController.swift
@@ -9,7 +9,6 @@
 import DownKit
 import RxSwift
 import UIKit
-import RxResult
 
 class DvrShowDetailViewController: UIViewController, Depending {
     typealias Dependencies = DvrShowDetailsViewModel.Dependencies

diff --git a/Down/Dvr/Show details/DvrShowDetailsViewModel.swift b/Down/Dvr/Show details/DvrShowDetailsViewModel.swift
@@ -9,8 +9,7 @@
 import DownKit
 import RxSwift
 import RxCocoa
-import Result
-import RxResult
+
 
 struct DvrShowDetailsViewModel: Depending {
     typealias Dependencies = DvrInteractorFactoryDependency & DvrRequestBuilderDependency
@@ -42,7 +41,7 @@ extension DvrShowDetailsViewModel: ReactiveBindable {
 
     struct Output {
         let refinedShow: Driver<RefinedShow>
-        let showDeleted: Observable<Result<Void, DownError>>
+        let showDeleted: Observable<Swift.Result<Void, DownError>>
     }
 }
 

diff --git a/Down/Dvr/Shows overview/DvrShowsCollectionViewModel.swift b/Down/Dvr/Shows overview/DvrShowsCollectionViewModel.swift
@@ -80,6 +80,6 @@ extension DvrShowsCollectionViewModel: UICollectionViewDelegate, UICollectionVie
 
 extension DvrShowsCollectionViewModel {
     func indexPath(for show: DvrShow) -> IndexPath {
-        return IndexPath(item: shows?.index(of: show) ?? NSNotFound, section: 0)
+        return IndexPath(item: shows?.firstIndex(of: show) ?? NSNotFound, section: 0)
     }
 }
diff --git a/Down/Settings/Application/ApplicationSettingsViewController.swift b/Down/Settings/Application/ApplicationSettingsViewController.swift
@@ -14,7 +14,6 @@ import RxSwift
 import RxCocoa
 import RxSwiftExt
 import RxRealm
-import Result
 
 class ApplicationSettingsViewController: UIViewController & Depending {
     typealias Dependencies = ApplicationSettingsViewModel.Dependencies

diff --git a/Down/Settings/Application/ApplicationSettingsViewModel.swift b/Down/Settings/Application/ApplicationSettingsViewModel.swift
@@ -9,8 +9,7 @@
 import DownKit
 import RxSwift
 import RxCocoa
-import Result
-import RxResult
+
 
 struct ApplicationSettingsViewModel: Depending {
     typealias Dependencies = ApiApplicationInteractorFactoryDependency
@@ -172,17 +171,16 @@ extension ApplicationSettingsViewModel {
             .makeApiKeyInteractor(for: application, credentials: credentials)
             .observeResult()
             .do(
-                onSuccess: {
-                    guard let apiKey = $0 else {
+                onSuccess: { optionalApiKey in
+                    guard let apiKey = optionalApiKey else {
                         NSLog("⚠️ -> Api key fetch was succesful, but no data was returend!")
                         return
                     }
 
                     NSLog("Api key -> \(apiKey)")
-            },
-                onFailure: { error in
+                }, onFailure: { error in
                     NSLog("ApiKey error -> \(error)")
-            }
+                }
             )
             .map { $0.value ?? nil }
             .asSingle()

diff --git a/Down/Shared/ErrorHandling/DownError.swift b/Down/Shared/ErrorHandling/DownError.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import DownKit
-import RxResult
+
 
 enum DownError: Error {
     case request(Error)

diff --git a/Down/Shared/Extensions/DownKitExtensions.swift b/Down/Shared/Extensions/DownKitExtensions.swift
@@ -8,8 +8,7 @@
 
 import DownKit
 import RxSwift
-import Result
-import RxResult
+
 
 extension Quality {
     var displayString: String {
@@ -117,7 +116,7 @@ extension DvrEpisodeStatus {
 }
 
 extension ObservableInteractor {
-    func observeResult() -> Observable<Result<Element, DownError>> {
+    func observeResult() -> Observable<Swift.Result<Element, DownError>> {
         return observe()
             .asObservable()
             .mapResult(DownError.self)

diff --git a/Down/Shared/Extensions/UITextFieldExtensions.swift b/Down/Shared/Extensions/UITextFieldExtensions.swift
@@ -14,7 +14,7 @@ extension Reactive where Base: UITextField {
     var debouncedText: Driver<String> {
         return text.orEmpty
             .asObservable()
-            .debounce(0.3, scheduler: MainScheduler.instance)
+            .debounce(.milliseconds(300), scheduler: MainScheduler.instance)
             .asDriver(onErrorJustReturn: String())
     }
 }
diff --git a/Down/Shared/Router.swift b/Down/Shared/Router.swift
@@ -109,7 +109,7 @@ extension Router {
 
         childRouter(ofType: type)?.stop()
 
-        if let index = ApiApplicationType.allCases.index(of: type) {
+        if let index = ApiApplicationType.allCases.firstIndex(of: type) {
             tabBarController?.viewControllers?.remove(at: index)
         }
     }
@@ -127,7 +127,7 @@ extension Router {
         }
 
         guard let viewController = vc,
-              let typeIndex = ApiApplicationType.allCases.index(of: type) else {
+            let typeIndex = ApiApplicationType.allCases.firstIndex(of: type) else {
             return nil
         }