diff --git a/CHANGELOG.md b/CHANGELOG.md index 3269d5df72..f8722865e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # master *Please put new entries at the top. +1. Update ReactiveSwift to 3.0. + 1. Added `placeholder` binding target to `UITextField`. (#3536) # 7.0.0-rc.1 diff --git a/Cartfile b/Cartfile index 6b84d19213..ecb3846b48 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveSwift" "3.0.0-rc.1" +github "ReactiveCocoa/ReactiveSwift" ~> 3.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 26be3403e4..ac9466c6ed 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "Quick/Nimble" "v7.0.2" github "Quick/Quick" "v1.2.0" -github "ReactiveCocoa/ReactiveSwift" "3.0.0-rc.1" +github "ReactiveCocoa/ReactiveSwift" "3.0.0" github "antitypical/Result" "3.2.4" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index f15a072862..2ec944c43e 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit f15a072862ff3d588104b475c6266c313eed8b8d +Subproject commit 2ec944c43ef9cf6b1380629e3ea483f62a7afaef