Merge pull request #1 from devxoul/swift-4.0

Let's Swift 4.0

Author: devxoul

.swift-version

@@ -0,0 +1 @@
+4.0

.travis.yml

@@ -1,14 +1,14 @@
-osx_image: xcode8.3
+osx_image: xcode9
 language: objective-c
 sudo: required
 env:
   global:
     - PROJECT="AlertReactor.xcodeproj"
-    - SCHEME="AlertReactor"
-    - IOS_SDK="iphonesimulator10.3"
+    - SCHEME="AlertReactor-Package"
+    - IOS_SDK="iphonesimulator11.0"
     - FRAMEWORK="AlertReactor"
   matrix:
-    - SDK="$IOS_SDK"      TEST=1  DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.3.1"
+    - SDK="$IOS_SDK"    DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.0"
 
 install:
   - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
@@ -19,26 +19,14 @@ before_script:
   - swift package generate-xcodeproj
 
 script:
-  - if [ $TEST == 1 ]; then
-      xcodebuild clean build test
-        -project "$PROJECT"
-        -scheme "$SCHEME"
-        -sdk "$SDK"
-        -destination "$DESTINATION"
-        -configuration Debug
-        -enableCodeCoverage YES
-        CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c;
-    else
-      xcodebuild clean build
-        -project "$PROJECT"
-        -scheme "$SCHEME"
-        -sdk "$SDK"
-        -destination "$DESTINATION"
-        -configuration Debug
-        CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c;
-    fi
+  - xcodebuild clean build test
+    -project "$PROJECT"
+    -scheme "$SCHEME"
+    -sdk "$SDK"
+    -destination "$DESTINATION"
+    -configuration Debug
+    -enableCodeCoverage YES
+    CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c
 
 after_success:
-  - if [ $TEST == 1 ]; then
-      bash <(curl -s https://codecov.io/bash) -J 'AlertReactor' -X xcodeplist;
-    fi
+  - bash <(curl -s https://codecov.io/bash) -X xcodeplist -J 'AlertReactor'

AlertReactor.podspec

@@ -10,12 +10,8 @@ Pod::Spec.new do |s|
   s.source_files = "Sources/**/*.{swift,h,m}"
   s.frameworks   = "UIKit"
   s.dependency "ReactorKit"
-  s.dependency "RxSwift", ">= 3.0.0"
-  s.dependency "RxCocoa", ">= 3.0.0"
+  s.dependency "RxSwift", ">= 4.0.0"
+  s.dependency "RxCocoa", ">= 4.0.0"
 
   s.ios.deployment_target = "8.0"
-
-  s.pod_target_xcconfig = {
-    "SWIFT_VERSION" => "3.1"
-  }
 end

Package.resolved

@@ -1,21 +1,19 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.0
 
-import Foundation
 import PackageDescription
 
-var dependencies: [Package.Dependency] = [
-  .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3),
-  .Package(url: "https://github.com/ReactorKit/ReactorKit.git", majorVersion: 0),
-]
-
-let isTest = ProcessInfo.processInfo.environment["TEST"] == "1"
-if isTest {
-  dependencies.append(
-    .Package(url: "https://github.com/devxoul/RxExpect.git", majorVersion: 0)
-  )
-}
-
 let package = Package(
   name: "AlertReactor",
-  dependencies: dependencies
+  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")),
+  ],
+  targets: [
+    .target(name: "AlertReactor", dependencies: ["ReactorKit", "RxCocoa"]),
+    .testTarget(name: "AlertReactorTests", dependencies: ["AlertReactor", "RxExpect"]),
+  ]
 )

Package.swift

@@ -1,6 +1,6 @@
 # AlertReactor
 
-![Swift](https://img.shields.io/badge/Swift-3.1-orange.svg)
+![Swift](https://img.shields.io/badge/Swift-4.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)

README.md

@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import UIKit
 
 public protocol AlertActionType: Equatable {
@@ -22,3 +23,4 @@ public extension UIAlertAction {
     self.isEnabled = action.isEnabled
   }
 }
+#endif

Sources/AlertActionType.swift …urces/AlertReactor/AlertActionType.swiftSources/AlertActionType.swift renamed to Sources/AlertReactor/AlertActionType.swift Sources/AlertActionType.swift renamed to Sources/AlertReactor/AlertActionType.swift

@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import UIKit
 
 import ReactorKit
@@ -107,8 +108,8 @@ extension Reactive where Base: AlertControllerType {
     return ControlEvent(events: source)
   }
 
-  public var actions: UIBindingObserver<Base, [Base.AlertAction]> {
-    return UIBindingObserver(UIElement: self.base) { alertController, actions in
+  public var actions: Binder<[Base.AlertAction]> {
+    return Binder(self.base) { alertController, actions in
       // do nothing if both old actions and new actions are empty
       guard !(alertController.actions.isEmpty && actions.isEmpty) else { return }
 
@@ -142,3 +143,4 @@ extension Reactive where Base: AlertControllerType {
     }
   }
 }
+#endif

Sources/AlertController.swift …urces/AlertReactor/AlertController.swiftSources/AlertController.swift renamed to Sources/AlertReactor/AlertController.swift Sources/AlertController.swift renamed to Sources/AlertReactor/AlertController.swift

@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import ReactorKit
 import RxSwift
 
@@ -62,3 +63,4 @@ open class AlertReactor<AlertAction: AlertActionType>: Reactor {
     return state
   }
 }
+#endif

Sources/AlertReactor.swift Sources/AlertReactor/AlertReactor.swiftSources/AlertReactor.swift renamed to Sources/AlertReactor/AlertReactor.swift

@@ -1,3 +1,4 @@
+#if os(iOS) || os(tvOS)
 import XCTest
 import RxExpect
 import RxTest
@@ -56,3 +57,4 @@ class AlertControllerTests: XCTestCase {
     XCTAssertEqual(controller.actions[3].style, .cancel)
   }
 }
+#endif