Skip to content

Commit

Permalink
Update ReactiveSwift to 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ikesyo committed Nov 18, 2017
1 parent aaa7ade commit aa81af2
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveCocoa/ReactiveSwift" ~> 2.0
github "ReactiveCocoa/ReactiveSwift" ~> 3.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveCocoa/ReactiveSwift" "2.0.1"
github "antitypical/Result" "3.2.3"
github "ReactiveCocoa/ReactiveSwift" "3.0.0"
github "antitypical/Result" "3.2.4"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveSwift
Submodule ReactiveSwift updated 48 files
+1 −0 .gitignore
+1 −1 .swift-version
+29 −99 .travis.yml
+38 −0 CHANGELOG.md
+2 −2 Cartfile.private
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/Result
+2 −4 Documentation/APIContracts.md
+1 −1 Documentation/FrameworkOverview.md
+3 −3 Package.pins
+4 −2 Package.swift
+13 −17 README.md
+1 −0 ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/FormView.swift
+1 −1 ReactiveSwift.podspec
+21 −22 ReactiveSwift.xcodeproj/project.pbxproj
+2 −0 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-iOS.xcscheme
+2 −0 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-macOS.xcscheme
+2 −0 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-tvOS.xcscheme
+4 −1 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-watchOS.xcscheme
+2 −3 Sources/Action.swift
+5 −5 Sources/Atomic.swift
+1 −1 Sources/Bag.swift
+6 −187 Sources/Deprecations+Removals.swift
+26 −1 Sources/Disposable.swift
+551 −7 Sources/Event.swift
+18 −34 Sources/Flatten.swift
+38 −68 Sources/FoundationExtensions.swift
+1 −1 Sources/Info.plist
+4 −3 Sources/Lifetime.swift
+60 −9 Sources/Observer.swift
+42 −53 Sources/Property.swift
+8 −0 Sources/Scheduler.swift
+115 −526 Sources/Signal.swift
+306 −157 Sources/SignalProducer.swift
+5 −5 Sources/UnidirectionalBinding.swift
+42 −42 Sources/UninhabitedTypeGuards.swift
+9 −6 Tests/ReactiveSwiftTests/FoundationExtensionsSpec.swift
+1 −1 Tests/ReactiveSwiftTests/Info.plist
+4 −2 Tests/ReactiveSwiftTests/PropertySpec.swift
+51 −32 Tests/ReactiveSwiftTests/SignalLifetimeSpec.swift
+3 −0 Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift
+3 −3 Tests/ReactiveSwiftTests/SignalProducerNimbleMatchers.swift
+29 −0 Tests/ReactiveSwiftTests/SignalProducerSpec.swift
+22 −31 Tests/ReactiveSwiftTests/SignalSpec.swift
+0 −2 Tests/ReactiveSwiftTests/UnidirectionalBindingSpec.swift
+5 −9 script/build
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
"state": {
"branch": null,
"revision": "b9d5b350a446b85704396ce332a1f9e4960cfc6b",
"version": "2.0.1"
"revision": "2ec944c43ef9cf6b1380629e3ea483f62a7afaef",
"version": "3.0.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let package = Package(
.library(name: "Tentacle", targets: ["Tentacle"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "2.0.0"),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "3.0.0"),
],
targets: [
.target(name: "Tentacle", dependencies: ["ReactiveSwift"]),
Expand Down

0 comments on commit aa81af2

Please sign in to comment.