From 0a87d628e2d7f47398fbbd7d0b8322a022b1b1cf Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Wed, 13 Jun 2018 22:31:58 +0200 Subject: [PATCH] Release 1.0.3 --- CHANGELOG.md | 4 ++++ Cartfile.resolved | 2 +- RxFeedback.podspec | 4 ++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Support/Info.plist | 2 +- Tests/RxFeedbackTests/RxFeedbackDriverTests.swift | 2 +- .../RxFeedbackTests/RxFeedbackObservableTests.swift | 2 +- dependencies.sh | 12 ++++++------ 8 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 RxFeedback.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/CHANGELOG.md b/CHANGELOG.md index 13a51aa..4734208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Master +## [1.0.2](https://github.com/kzaher/RxFeedback/releases/tag/1.0.3) + +* Fixes problem with feedback loop termination. + ## [1.0.2](https://github.com/kzaher/RxFeedback/releases/tag/1.0.2) * Fixes duplicated plist inclusion. diff --git a/Cartfile.resolved b/Cartfile.resolved index d070f13..00b43a8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.0.0" +github "ReactiveX/RxSwift" "4.2.0" diff --git a/RxFeedback.podspec b/RxFeedback.podspec index b655f23..6fc69dd 100644 --- a/RxFeedback.podspec +++ b/RxFeedback.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "RxFeedback" - s.version = "1.0.2" + s.version = "1.0.3" s.summary = "Simplest architecture for RxSwift. State + feedback loops." s.description = <<-DESC Simplest architecture for RxSwift. State + feedback loops. @@ -45,4 +45,4 @@ Pod::Spec.new do |s| s.dependency 'RxSwift', '~> 4.0' s.dependency 'RxCocoa', '~> 4.0' -end \ No newline at end of file +end diff --git a/RxFeedback.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RxFeedback.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/RxFeedback.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Support/Info.plist b/Support/Info.plist index 38e98af..2c1883c 100644 --- a/Support/Info.plist +++ b/Support/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 1.0.3 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift b/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift index b93d873..dcb518d 100644 --- a/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift +++ b/Tests/RxFeedbackTests/RxFeedbackDriverTests.swift @@ -323,7 +323,7 @@ extension RxFeedbackDriverTests { return timer.map { _ in 1 } }) - let mockUIBindings: Feedback = bind { state in + let mockUIBindings: Feedback = RxFeedback.bind { (state: Driver) in let subscriptions: [Disposable] = [ state.drive(onNext:{ subscriptionState.append($0) }) ] diff --git a/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift b/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift index 1dedcb6..9f8bc0c 100644 --- a/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift +++ b/Tests/RxFeedbackTests/RxFeedbackObservableTests.swift @@ -349,7 +349,7 @@ extension RxFeedbackObservableTests { return timer.map { _ in 1 } }) - let mockUIBindings: Feedback = bind { state in + let mockUIBindings: Feedback = RxFeedback.bind { state in let subscriptions: [Disposable] = [ state .do(onDispose: { subscriptionIsDisposed = true }) diff --git a/dependencies.sh b/dependencies.sh index 9b48daf..e79e7ae 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -1,6 +1,6 @@ -#set -e -#if [[ ( ! -d "RxSwift/.git" ) && ( ! -d "Carthage" ) && ( ! -d 'Pods' ) ]]; then -# git submodule update --init --recursive --force -# cd RxSwift -# git reset origin/master --hard -#fi +set -e +if [[ ( ! -d "RxSwift/.git" ) && ( ! -d "Carthage" ) && ( ! -d 'Pods' ) ]]; then + git submodule update --init --recursive --force + cd RxSwift + git reset origin/master --hard +fi