Merge branch 'fassko-master'

.swift-version

@@ -1 +1 @@
-4.0
+4.2

Example/Example for RxAnimated AppleTV/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }

Example/Podfile

@@ -2,16 +2,16 @@ use_frameworks!
 
 target 'RxAnimated_Example' do
 
-  pod 'RxSwift', '~> 4.0.0'
-  pod 'RxCocoa', '~> 4.0.0'
+  pod 'RxSwift', '~> 4.3.0'
+  pod 'RxCocoa', '~> 4.3.0'
   pod 'RxAnimated', :path => '../'
 
 end
 
 target 'RxAnimated-Example-AppleTV' do
 
-  pod 'RxSwift', '~> 4.0.0'
-  pod 'RxCocoa', '~> 4.0.0'
+  pod 'RxSwift', '~> 4.3.0'
+  pod 'RxCocoa', '~> 4.3.0'
   pod 'RxAnimated', :path => '../'
 
 end

Example/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

RxAnimated.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'RxAnimated'
-  s.version          = '0.4.1'
+  s.version          = '0.5.0'
   s.summary          = 'Animated bindings for RxSwift/RxCocoa'
 
   s.description      = <<-DESC
@@ -27,7 +27,9 @@ Pod::Spec.new do |s|
 #  end
 
   s.frameworks = 'UIKit'
-  s.dependency 'RxSwift', '~> 4.0'
-  s.dependency 'RxCocoa', '~> 4.0'
+  s.dependency 'RxSwift', '~> 4.3'
+  s.dependency 'RxCocoa', '~> 4.3'
+
+  s.swift_version = "4.2"
 
 end

RxAnimated/Core/RxAnimated+animations.swift

@@ -5,7 +5,7 @@ import RxCocoa
 public enum FlipDirection {
     case left, right, top, bottom
 
-    var viewTransition: UIViewAnimationOptions {
+    var viewTransition: UIView.AnimationOptions {
         switch self {
         case .left: return .transitionFlipFromLeft
         case .right: return .transitionFlipFromRight
@@ -42,7 +42,7 @@ extension AnimatedSink where Base: UIView {
         return AnimatedSink<Base>(base: self.base, type: type)
     }
 
-    public func animation(duration: TimeInterval, options: UIViewAnimationOptions = [], animations: @escaping ()->Void) -> AnimatedSink<Base> {
+    public func animation(duration: TimeInterval, options: UIView.AnimationOptions = [], animations: @escaping ()->Void) -> AnimatedSink<Base> {
         let type = AnimationType<Base>(type: RxAnimationType.animation, duration: duration, animations: { _ in animations() })
         return AnimatedSink<Base>(base: self.base, type: type)
     }

RxAnimated/Core/RxAnimated.swift

@@ -19,7 +19,7 @@ public struct RxAnimated {
  */
 public enum RxAnimationType {
     case animation
-    case transition(UIViewAnimationOptions)
+    case transition(UIView.AnimationOptions)
     case spring(damping: CGFloat, velocity: CGFloat)
 }
 
@@ -29,7 +29,7 @@ public enum RxAnimationType {
 public struct AnimationType<Base> {
     let type: RxAnimationType
     let duration: TimeInterval
-    let options: UIViewAnimationOptions
+    let options: UIView.AnimationOptions
 
     let setup: ((UIView)->Void)?
     let animations: ((UIView)->Void)?
@@ -44,7 +44,7 @@ public struct AnimationType<Base> {
      * - parameter animations: block of code to be executed during animation
      * - parameter completion: block of code to be executed after the animation has finished
      */
-    public init(type: RxAnimationType, duration: TimeInterval, options: UIViewAnimationOptions = [], setup: ((UIView)->Void)? = nil, animations: ((UIView)->Void)?, completion: ((Bool)->Void)? = nil) {
+    public init(type: RxAnimationType, duration: TimeInterval, options: UIView.AnimationOptions = [], setup: ((UIView)->Void)? = nil, animations: ((UIView)->Void)?, completion: ((Bool)->Void)? = nil) {
         self.type = type
         self.duration = duration
         self.options = options
@@ -93,10 +93,10 @@ public struct AnimationType<Base> {
             return ProcessInfo.processInfo.isLowPowerModeEnabled
                 || ProcessInfo.processInfo.thermalState == .serious
                 || ProcessInfo.processInfo.thermalState == .critical
-                || UIAccessibilityIsReduceMotionEnabled()
+                || UIAccessibility.isReduceMotionEnabled
         } else {
             return ProcessInfo.processInfo.isLowPowerModeEnabled
-                || UIAccessibilityIsReduceMotionEnabled()
+                || UIAccessibility.isReduceMotionEnabled
         }
     }
 }