Skip to content

Commit

Permalink
Update source + Cartfile for RAC v4 alpha 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@JRHeaton
JRHeaton committed Oct 26, 2015
1 parent 1eea3a0 commit 3cd402c
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" ~> 3.0
github "ReactiveCocoa/ReactiveCocoa" "swift2"
github "ReactiveX/RxSwift" "2.0.0-beta.1"
github "Alamofire/Alamofire" ~> 3.0
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
github "ReactiveX/RxSwift" "2.0.0-beta.1"
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" "3.1.0"
github "antitypical/Result" "0.6.0-beta.3"
github "antitypical/Result" "0.6.0-beta.5"
github "ReactiveX/RxSwift" "2.0.0-beta.1"
github "ReactiveCocoa/ReactiveCocoa" "9af5f32b4f9f908ae5f26904fbaf49d0a9039e24"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa updated 25 files
+45 −2 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.resolved
+1 −1 Carthage/Checkouts/Result
+30 −30 Documentation/BasicOperators.md
+20 −23 Documentation/DesignGuidelines.md
+5 −5 Documentation/FrameworkOverview.md
+18 −12 README.md
+40 −16 ReactiveCocoa.xcodeproj/project.pbxproj
+2 −2 ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-Mac.xcscheme
+2 −2 ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS.xcscheme
+80 −0 ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-tvOS.xcscheme
+4 −4 ReactiveCocoa/Swift/Action.swift
+19 −19 ReactiveCocoa/Swift/Event.swift
+1 −1 ReactiveCocoa/Swift/FoundationExtensions.swift
+5 −5 ReactiveCocoa/Swift/ObjectiveCBridging.swift
+8 −8 ReactiveCocoa/Swift/Observer.swift
+53 −53 ReactiveCocoa/Swift/Signal.swift
+34 −34 ReactiveCocoa/Swift/SignalProducer.swift
+3 −3 ReactiveCocoaTests/Swift/ActionSpec.swift
+2 −2 ReactiveCocoaTests/Swift/ObjectiveCBridgingSpec.swift
+16 −16 ReactiveCocoaTests/Swift/SignalProducerLiftingSpec.swift
+1 −1 ReactiveCocoaTests/Swift/SignalProducerNimbleMatchers.swift
+16 −16 ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+21 −21 ReactiveCocoaTests/Swift/SignalSpec.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Submodule Result updated 9 files
+10 −0 .travis.yml
+23 −0 CONTRIBUTING.md
+1 −0 README.md
+1 −1 Result.podspec
+14 −0 Result.xcodeproj/project.pbxproj
+99 −0 Result.xcodeproj/xcshareddata/xcschemes/Result-tvOS.xcscheme
+1 −26 Result/Result.swift
+52 −3 Result/ResultType.swift
+2 −2 ResultTests/ResultTests.swift
4 changes: 0 additions & 4 deletions Moya.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
091F0D961BDE9D79009D0A49 /* Moya+RxSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 091F0D5C1BDE9A37009D0A49 /* Moya+RxSwift.swift */; };
091F0D971BDE9D7A009D0A49 /* Observable+Moya.swift in Sources */ = {isa = PBXBuildFile; fileRef = 091F0D5D1BDE9A37009D0A49 /* Observable+Moya.swift */; };
091F0D981BDE9D9A009D0A49 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091F0D6B1BDE9B0C009D0A49 /* Alamofire.framework */; };
091F0D9A1BDE9D9B009D0A49 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091F0D991BDE9D9B009D0A49 /* RxSwift.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -69,7 +68,6 @@
091F0D831BDE9D4D009D0A49 /* RxMoya.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxMoya.framework; sourceTree = BUILT_PRODUCTS_DIR; };
091F0D851BDE9D4D009D0A49 /* RxMoya.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxMoya.h; sourceTree = "<group>"; };
091F0D871BDE9D4D009D0A49 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
091F0D991BDE9D9B009D0A49 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -94,7 +92,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
091F0D9A1BDE9D9B009D0A49 /* RxSwift.framework in Frameworks */,
091F0D981BDE9D9A009D0A49 /* Alamofire.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -105,7 +102,6 @@
091F0D2A1BDE998F009D0A49 = {
isa = PBXGroup;
children = (
091F0D991BDE9D9B009D0A49 /* RxSwift.framework */,
091F0D4C1BDE9A37009D0A49 /* Source */,
091F0D361BDE998F009D0A49 /* Moya */,
091F0D451BDE9A01009D0A49 /* ReactiveMoya */,
Expand Down
2 changes: 1 addition & 1 deletion ReactiveMoya.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Pod::Spec.new do |s|

s.source_files = ["Source/*swift", "Source/Plugins/*swift", "Source/ReactiveCore/*.swift", "Source/ReactiveCocoa/*.swift"]
s.dependency 'Alamofire', "~> 3.0"
s.dependency "ReactiveCocoa", "~> 4.0-alpha.1"
s.dependency "ReactiveCocoa", "4.0-alpha.3"
end
2 changes: 1 addition & 1 deletion Source/ReactiveCocoa/Moya+ReactiveCocoa.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ReactiveCocoaMoyaProvider<Target where Target: MoyaTarget>: MoyaPro

let cancellableToken = self?.request(token) { data, statusCode, response, error in
if let error = error {
requestSink.sendError(error as NSError)
requestSink.sendFailed(error as NSError)
} else {
if let data = data {
requestSink.sendNext(MoyaResponse(statusCode: statusCode!, data: data, response: response))
Expand Down

0 comments on commit 3cd402c

Please sign in to comment.