From 1e76e8217bfa6ee4205913d1b3f98de513743cf3 Mon Sep 17 00:00:00 2001 From: Marin Todorov Date: Sat, 28 Oct 2017 10:00:05 +0200 Subject: [PATCH] rxswift 4.0 --- .swift-version | 2 +- Example/Podfile | 5 +++-- Example/RxAnimated/ViewController.swift | 2 +- README.md | 20 +++++--------------- RxAnimated.podspec | 12 ++++++------ RxAnimated/Core/RxAnimated+animations.swift | 4 ---- RxAnimated/Core/RxAnimated+bindings.swift | 4 ---- RxAnimated/Core/RxAnimated.swift | 4 ---- 8 files changed, 16 insertions(+), 37 deletions(-) diff --git a/.swift-version b/.swift-version index 155bb62..5186d07 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.04.04.04.0 +4.0 diff --git a/Example/Podfile b/Example/Podfile index 0f01ba5..3ed13b4 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -2,7 +2,8 @@ use_frameworks! target 'RxAnimated_Example' do - pod 'RxSwift', '~> 4.0.0-beta.0' - pod 'RxCocoa', '~> 4.0.0-beta.0' + pod 'RxSwift', '~> 4.0.0' + pod 'RxCocoa', '~> 4.0.0' pod 'RxAnimated', :path => '../' + end diff --git a/Example/RxAnimated/ViewController.swift b/Example/RxAnimated/ViewController.swift index 20bc63d..a2f8753 100644 --- a/Example/RxAnimated/ViewController.swift +++ b/Example/RxAnimated/ViewController.swift @@ -30,7 +30,7 @@ class ViewController: UIViewController { @IBOutlet var leftConstraint: NSLayoutConstraint! @IBOutlet var rightConstraint: NSLayoutConstraint! - private let timer = Observable.timer(0, period: 1, scheduler: MainScheduler.instance).shareReplay(1) + private let timer = Observable.timer(0, period: 1, scheduler: MainScheduler.instance).share(replay: 1) private let bag = DisposeBag() override func viewDidLoad() { diff --git a/README.md b/README.md index 71fa5a4..82c80c7 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,10 @@ -# [WIP] RxAnimated +# RxAnimated - animated bindings [![CI Status](http://img.shields.io/travis/icanzilb/RxAnimated.svg?style=flat)](https://travis-ci.org/icanzilb/RxAnimated) [![Version](https://img.shields.io/cocoapods/v/RxAnimated.svg?style=flat)](http://cocoapods.org/pods/RxAnimated) [![License](https://img.shields.io/cocoapods/l/RxAnimated.svg?style=flat)](http://cocoapods.org/pods/RxAnimated) [![Platform](https://img.shields.io/cocoapods/p/RxAnimated.svg?style=flat)](http://cocoapods.org/pods/RxAnimated) -> **NB:** This is a pre-release software, currently the lib works with Xcode9 GM and RxSwift4 beta.0. - - **RxAnimated** provides animation interface to RxCocoa's bindings. It comes with few predefined animation bindings, and provides a flexible mechanism for you to add your own predefined animations and use them when binding with RxCocoa. @@ -145,29 +142,22 @@ textObservable ![](etc/custom-label-anim.gif) -The sky is the limit! (Or good taste ofc.) +The sky is the limit! (And good taste.) ## Example The demo app shows few animations in action, download the repo and give it a try. -## Requirements - -> !! RxSwift 4 beta.0 - ## Installation -RxAnimated is available through [CocoaPods](http://cocoapods.org). To install -it, simply add the following line to your Podfile: +RxAnimated depends on RxSwift 4+. + +RxAnimated is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your Podfile: ```ruby pod "RxAnimated" ``` -## Author - -Marin Todorov, https://github.com/icanzilb - ## License RxAnimated is available under the MIT license. See the LICENSE file for more info. diff --git a/RxAnimated.podspec b/RxAnimated.podspec index 6dcb505..8ebb4eb 100644 --- a/RxAnimated.podspec +++ b/RxAnimated.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxAnimated' - s.version = '0.1.0-beta.1' + s.version = '0.2.0' s.summary = 'Animated bindings for RxSwift/RxCocoa' s.description = <<-DESC @@ -21,12 +21,12 @@ Pod::Spec.new do |s| s.source_files = 'RxAnimated/Core/**/*' end - s.subspec 'Markdown' do |cs| - #cs.source_files = 'RxAnimated/Animations/*' - end +# s.subspec 'Animations' do |cs| +# s.source_files = 'RxAnimated/Animations/*' +# end s.frameworks = 'UIKit' - s.dependency 'RxSwift', '~> 4.0.0-beta.0' - s.dependency 'RxCocoa', '~> 4.0.0-beta.0' + s.dependency 'RxSwift', '~> 4.0.0' + s.dependency 'RxCocoa', '~> 4.0.0' end diff --git a/RxAnimated/Core/RxAnimated+animations.swift b/RxAnimated/Core/RxAnimated+animations.swift index 579ae47..e4c5be7 100644 --- a/RxAnimated/Core/RxAnimated+animations.swift +++ b/RxAnimated/Core/RxAnimated+animations.swift @@ -1,7 +1,3 @@ -// -// Marin Todorov, https://github.com/icanzilb -// - import RxSwift import RxCocoa diff --git a/RxAnimated/Core/RxAnimated+bindings.swift b/RxAnimated/Core/RxAnimated+bindings.swift index ef40394..7c1519e 100644 --- a/RxAnimated/Core/RxAnimated+bindings.swift +++ b/RxAnimated/Core/RxAnimated+bindings.swift @@ -1,7 +1,3 @@ -// -// Marin Todorov, https://github.com/icanzilb -// - import RxSwift import RxCocoa diff --git a/RxAnimated/Core/RxAnimated.swift b/RxAnimated/Core/RxAnimated.swift index bc0b0cd..b8841fc 100644 --- a/RxAnimated/Core/RxAnimated.swift +++ b/RxAnimated/Core/RxAnimated.swift @@ -1,7 +1,3 @@ -// -// Marin Todorov, https://github.com/icanzilb -// - import RxSwift import RxCocoa