Let's Swift 5.0 🚀

.travis.yml

@@ -1,14 +1,14 @@
-osx_image: xcode10
+osx_image: xcode10.2
 language: objective-c
 sudo: required
 env:
   global:
     - PROJECT="AlertReactor.xcodeproj"
     - SCHEME="AlertReactor-Package"
-    - IOS_SDK="iphonesimulator12.0"
+    - IOS_SDK="iphonesimulator12.2"
     - FRAMEWORK="AlertReactor"
   matrix:
-    - SDK="$IOS_SDK"    DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.0"
+    - SDK="$IOS_SDK"    DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.2"
 
 install:
   - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"

AlertReactor.podspec

@@ -9,9 +9,10 @@ Pod::Spec.new do |s|
                          :tag => s.version.to_s }
   s.source_files = "Sources/**/*.{swift,h,m}"
   s.frameworks   = "UIKit"
-  s.dependency "ReactorKit"
-  s.dependency "RxSwift", ">= 4.0.0"
-  s.dependency "RxCocoa", ">= 4.0.0"
+  s.dependency "ReactorKit", ">= 2.0.0"
+  s.dependency "RxSwift", "~> 5.0"
+  s.dependency "RxCocoa", "~> 5.0"
+  s.swift_version = "5.0"
 
   s.ios.deployment_target = "8.0"
 end

Package.resolved

@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/ReactorKit/ReactorKit.git",
         "state": {
           "branch": null,
-          "revision": "92532e322805ecccff8b98a81f356232260ccbf0",
-          "version": "1.0.0"
+          "revision": "d960b9537a0fdc869340a2c1af17959bab832570",
+          "version": "2.0.1"
         }
       },
       {
         "package": "RxExpect",
         "repositoryURL": "https://github.com/devxoul/RxExpect.git",
         "state": {
           "branch": null,
-          "revision": "cb1ba5377d8d8f9743e26ece6a4d42d11dbd3792",
-          "version": "1.0.0"
+          "revision": "c3a3bb3d46ee831582c6619ecc48cda1cdbff890",
+          "version": "2.0.0"
         }
       },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "12cccb171ad9038251af6883807f0290c1d75a5b",
-          "version": "4.0.0"
+          "revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
+          "version": "5.0.1"
         }
       }
     ]

Package.swift

@@ -1,16 +1,19 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 
 let package = Package(
   name: "AlertReactor",
+  platforms: [
+    .iOS(.v8)
+  ],
   products: [
     .library(name: "AlertReactor", targets: ["AlertReactor"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
-    .package(url: "https://github.com/ReactorKit/ReactorKit.git", .upToNextMajor(from: "1.0.0")),
-    .package(url: "https://github.com/devxoul/RxExpect.git", .upToNextMajor(from: "1.0.0")),
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
+    .package(url: "https://github.com/ReactorKit/ReactorKit.git", .upToNextMajor(from: "2.0.0")),
+    .package(url: "https://github.com/devxoul/RxExpect.git", .upToNextMajor(from: "2.0.0")),
   ],
   targets: [
     .target(name: "AlertReactor", dependencies: ["ReactorKit", "RxCocoa"]),

README.md

@@ -1,6 +1,6 @@
 # AlertReactor
 
-![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
+![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
 [![CocoaPods](http://img.shields.io/cocoapods/v/AlertReactor.svg)](https://cocoapods.org/pods/AlertReactor)
 [![Build Status](https://travis-ci.org/devxoul/AlertReactor.svg?branch=master)](https://travis-ci.org/devxoul/AlertReactor)
 [![Codecov](https://img.shields.io/codecov/c/github/devxoul/AlertReactor.svg)](https://codecov.io/gh/devxoul/AlertReactor)

Sources/AlertReactor/AlertActionType.swift

@@ -18,7 +18,7 @@ public extension AlertActionType {
 }
 
 public extension UIAlertAction {
-  public convenience init<Action: AlertActionType>(action: Action, handler: ((Action) -> Void)? = nil) {
+  convenience init<Action: AlertActionType>(action: Action, handler: ((Action) -> Void)? = nil) {
     self.init(title: action.title, style: action.style) { _ in handler?(action) }
     self.isEnabled = action.isEnabled
   }

Tests/AlertReactorTests/AlertControllerTests.swift

@@ -7,7 +7,7 @@ import AlertReactor
 class AlertControllerTests: XCTestCase {
   func testState_title() {
     let reactor = AlertReactor<MyAlertAction>()
-    reactor.stub.isEnabled = true
+    reactor.isStubEnabled = true
 
     let controller = AlertController<MyAlertAction>(reactor: reactor)
     _ = controller.view
@@ -17,7 +17,7 @@ class AlertControllerTests: XCTestCase {
 
   func testState_message() {
     let reactor = AlertReactor<MyAlertAction>()
-    reactor.stub.isEnabled = true
+    reactor.isStubEnabled = true
 
     let controller = AlertController<MyAlertAction>(reactor: reactor)
     _ = controller.view
@@ -27,7 +27,7 @@ class AlertControllerTests: XCTestCase {
 
   func testState_actions() {
     let reactor = AlertReactor<MyAlertAction>()
-    reactor.stub.isEnabled = true
+    reactor.isStubEnabled = true
 
     let controller = AlertController<MyAlertAction>(reactor: reactor)
     _ = controller.view

Tests/AlertReactorTests/AlertReactorTests.swift

@@ -9,7 +9,7 @@ class AlertReactorTests: XCTestCase {
     let test = RxExpect()
     let reactor = MyAlertReactor(scheduler: test.scheduler)
     test.retain(reactor)
-    test.input(reactor.action, [next(100, .prepare)])
+    test.input(reactor.action, [.next(100, .prepare)])
     test.assert(reactor.state.map { $0.actions }) { events in
       XCTAssertEqual(events.elements.count, 5)
       XCTAssertEqual(events.elements[0], [])

Tests/AlertReactorTests/Fixtures.swift

@@ -41,9 +41,9 @@ final class MyAlertReactor: AlertReactor<MyAlertAction> {
     case .prepare:
       return Observable.concat([
         Observable.just(.setActions([.cancel])),
-        Observable.just(.setActions([.edit, .cancel])).delay(100, scheduler: self.scheduler),
-        Observable.just(.setActions([.edit, .delete, .cancel])).delay(100, scheduler: self.scheduler),
-        Observable.just(.setActions([.edit, .share, .delete, .cancel])).delay(100, scheduler: self.scheduler),
+        Observable.just(.setActions([.edit, .cancel])).delay(.seconds(100), scheduler: self.scheduler),
+        Observable.just(.setActions([.edit, .delete, .cancel])).delay(.seconds(100), scheduler: self.scheduler),
+        Observable.just(.setActions([.edit, .share, .delete, .cancel])).delay(.seconds(100), scheduler: self.scheduler),
       ])
 
     case .selectAction: