Skip to content

Commit

Permalink
Merge pull request #38 from Carthage/rac4-alpha4
Browse files Browse the repository at this point in the history
Update RAC to 4.0-alpha.4
  • Loading branch information
mdiep committed Dec 1, 2015
2 parents 801e295 + 729d38c commit e8d9353
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.4"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "v3.0.0"
github "Quick/Quick" "v0.8.0"
github "antitypical/Result" "0.6.0-beta.5"
github "antitypical/Result" "1.0.0"
github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.4"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa updated 38 files
+11 −0 .travis.yml
+1 −1 Cartfile
+2 −2 Cartfile.private
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/Result
+ Logo/Icons/flat-icon.png
+ Logo/Icons/gradient-icon.png
+ Logo/Icons/mono-dark-icon-alt.png
+ Logo/Icons/mono-dark-icon.png
+ Logo/Icons/mono-light-icon-alt.png
+ Logo/Icons/mono-light-icon.png
+ Logo/PNG/flat-logo.png
+ Logo/PNG/logo.png
+ Logo/PNG/mono-dark-bg.png
+ Logo/PNG/mono-light-bg.png
+ Logo/Palette.png
+24 −0 Logo/README.md
+1 −0 Logo/SVG/flat-logo.svg
+1 −0 Logo/SVG/logo.svg
+1 −0 Logo/SVG/mono-dark-bg.svg
+1 −0 Logo/SVG/mono-light-bg.svg
+ Logo/header.png
+4 −5 README.md
+12 −0 ReactiveCocoa.xcodeproj/project.pbxproj
+44 −2 ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-Mac.xcscheme
+44 −2 ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS.xcscheme
+1 −1 ReactiveCocoa/Objective-C/RACDynamicPropertySuperclass.h
+7 −22 ReactiveCocoa/Swift/Bag.swift
+121 −84 ReactiveCocoa/Swift/ObjectiveCBridging.swift
+1 −1 ReactiveCocoa/Swift/Property.swift
+104 −2 ReactiveCocoa/Swift/Signal.swift
+65 −58 ReactiveCocoa/Swift/SignalProducer.swift
+6 −6 ReactiveCocoaTests/Swift/ObjectiveCBridgingSpec.swift
+82 −0 ReactiveCocoaTests/Swift/SignalProducerLiftingSpec.swift
+15 −0 ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+135 −1 ReactiveCocoaTests/Swift/SignalSpec.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result

0 comments on commit e8d9353

Please sign in to comment.