Skip to content

Commit

Permalink
Merge pull request #12 from Carthage/swift-1.2
Browse files Browse the repository at this point in the history
Swift 1.2b3
  • Loading branch information
robrix committed Mar 14, 2015
2 parents a42e9fe + c6d4212 commit f03304d
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 26 deletions.
8 changes: 0 additions & 8 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveCocoa/ReactiveCocoa" "swift-development"
github "LlamaKit/LlamaKit" == 0.5
github "ReactiveCocoa/ReactiveCocoa" "v3.0-alpha.2"
github "LlamaKit/LlamaKit" ~> 0.6
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Quick" ~> 0.2
github "Quick/Nimble" ~> 0.3
github "Quick/Quick" "master"
github "Quick/Nimble" "master"
github "jspahrsummers/xcconfigs" >= 0.6
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "LlamaKit/LlamaKit" "v0.5.0"
github "Quick/Nimble" "v0.3.0"
github "Quick/Quick" "v0.2.2"
github "LlamaKit/LlamaKit" "v0.6.0"
github "Quick/Nimble" "6a679cbf20da3fe570c26296b3029dd168b72c00"
github "Quick/Quick" "155f858bce082373fc60d0c0a63415bf336c676b"
github "jspahrsummers/xcconfigs" "0.7.2"
github "ReactiveCocoa/ReactiveCocoa" "240140c14d023cdb49f4ddf9622c3131619b2197"
github "ReactiveCocoa/ReactiveCocoa" "81860e1cc969f9224ac81d18ca3739d284553fb8"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/LlamaKit
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 44 files
+0 −9 .travis.yml
+16 −1 CONTRIBUTING.md
+1 −1 Nimble.podspec
+32 −8 Nimble.xcodeproj/project.pbxproj
+1 −2 Nimble/Adapters/AdapterProtocols.swift
+3 −3 Nimble/Adapters/AssertionRecorder.swift
+12 −0 Nimble/Adapters/NimbleXCTestHandler.swift
+0 −10 Nimble/Adapters/XCTestHandler.swift
+7 −7 Nimble/DSL+Wait.swift
+6 −4 Nimble/DSL.swift
+1 −1 Nimble/Expectation.swift
+7 −5 Nimble/Expression.swift
+1 −1 Nimble/FailureMessage.swift
+99 −0 Nimble/Matchers/AllPass.swift
+14 −3 Nimble/Matchers/BeEmpty.swift
+1 −1 Nimble/Matchers/BeGreaterThan.swift
+1 −1 Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+1 −1 Nimble/Matchers/BeLessThan.swift
+1 −1 Nimble/Matchers/BeginWith.swift
+14 −1 Nimble/Matchers/Contain.swift
+1 −1 Nimble/Matchers/EndWith.swift
+62 −0 Nimble/Matchers/Equal.swift
+1 −1 Nimble/Matchers/Match.swift
+2 −2 Nimble/Matchers/MatcherProtocols.swift
+177 −36 Nimble/Matchers/RaisesException.swift
+3 −3 Nimble/Utils/Stringers.swift
+33 −16 Nimble/Wrappers/AsyncMatcherWrapper.swift
+10 −2 Nimble/objc/DSL.h
+10 −2 Nimble/objc/DSL.m
+6 −7 NimbleTests/AsynchronousTest.swift
+5 −5 NimbleTests/Helpers/utils.swift
+74 −0 NimbleTests/Matchers/AllPassTest.swift
+1 −1 NimbleTests/Matchers/BeEmptyTest.swift
+9 −9 NimbleTests/Matchers/BeIdenticalToObjectTest.swift
+2 −2 NimbleTests/Matchers/BeIdenticalToTest.swift
+1 −1 NimbleTests/Matchers/BeNilTest.swift
+2 −2 NimbleTests/Matchers/BeginWithTest.swift
+2 −2 NimbleTests/Matchers/EndWithTest.swift
+31 −0 NimbleTests/Matchers/EqualTest.swift
+78 −27 NimbleTests/Matchers/RaisesExceptionTest.swift
+38 −0 NimbleTests/objc/ObjCAllPassTest.m
+80 −0 NimbleTests/objc/ObjCBeEmptyTest.m
+74 −3 NimbleTests/objc/ObjCRaiseExceptionTest.m
+84 −20 README.md
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 37 files
+0 −5 .travis.yml
+4 −0 CONTRIBUTING.md
+220 −0 Documentation/ArrangeActAssert.md
+87 −0 Documentation/BehavioralTesting.md
+103 −0 Documentation/ConfiguringQuick.md
+28 −0 Documentation/InstallingFileTemplates.md
+141 −0 Documentation/InstallingQuick.md
+28 −0 Documentation/MoreResources.md
+106 −0 Documentation/NimbleAssertions.md
+462 −0 Documentation/QuickExamplesAndGroups.md
+53 −0 Documentation/QuickInObjectiveC.md
+42 −0 Documentation/README.md
+73 −0 Documentation/SettingUpYourXcodeProject.md
+125 −0 Documentation/SharedExamples.md
+179 −0 Documentation/TestingApps.md
+1 −1 Externals/Nimble
+3 −2 Quick.podspec
+38 −64 Quick.xcodeproj/project.pbxproj
+0 −1,348 Quick.xcodeproj/project.pbxproj.orig
+17 −17 Quick/DSL/DSL.swift
+1 −1 Quick/DSL/QCKDSL.h
+3 −3 Quick/DSL/QCKDSL.m
+9 −9 Quick/DSL/World+DSL.swift
+0 −25 QuickTests/ExampleMetadataFunctionalTests.swift
+1 −1 QuickTests/Fixtures/FunctionalTests_SharedExamplesTests_SharedExamples.swift
+0 −27 QuickTests/Fixtures/Person.swift
+0 −11 QuickTests/Fixtures/Poet.swift
+0 −65 QuickTests/FunctionalTests+ObjC.m
+0 −156 QuickTests/FunctionalTests.swift
+42 −0 QuickTests/FunctionalTests/AfterSuiteTests+ObjC.m
+1 −1 QuickTests/FunctionalTests/AfterSuiteTests.swift
+0 −0 QuickTests/FunctionalTests/BeforeSuiteTests+ObjC.m
+1 −1 QuickTests/FunctionalTests/BeforeSuiteTests.swift
+59 −0 QuickTests/FunctionalTests/SharedExamples+BeforeEachTests+ObjC.m
+36 −0 QuickTests/FunctionalTests/SharedExamplesTests+ObjC.m
+0 −21 QuickTests/FunctionalTests/WorldExampleMetadataFunctionalTests.swift
+5 −946 README.md
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa updated 36 files
+0 −11 .travis.yml
+1 −1 Cartfile
+2 −2 Cartfile.private
+4 −4 Cartfile.resolved
+1 −1 Carthage/Checkouts/LlamaKit
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/xcconfigs
+3 −3 Documentation/FrameworkOverview.md
+7 −17 README.md
+19 −8 ReactiveCocoa.xcodeproj/project.pbxproj
+5 −1 ReactiveCocoa/Objective-C/NSObject+RACDescription.m
+9 −0 ReactiveCocoa/Objective-C/NSObject+RACPropertySubscribing.h
+8 −0 ReactiveCocoa/Objective-C/RACDynamicPropertySuperclass.h
+22 −0 ReactiveCocoa/Objective-C/RACDynamicPropertySuperclass.m
+5 −0 ReactiveCocoa/Objective-C/RACKVOChannel.h
+4 −2 ReactiveCocoa/Objective-C/RACSignal+Operations.m
+1 −1 ReactiveCocoa/Objective-C/RACTestScheduler.m
+4 −4 ReactiveCocoa/Objective-C/UITextField+RACSignalSupport.h
+2 −2 ReactiveCocoa/Objective-C/UITextField+RACSignalSupport.m
+1 −0 ReactiveCocoa/ReactiveCocoa.h
+1 −1 ReactiveCocoa/Swift/Disposable.swift
+1 −1 ReactiveCocoa/Swift/ObjectiveCBridging.swift
+4 −4 ReactiveCocoa/Swift/Property.swift
+2 −2 ReactiveCocoa/Swift/Scheduler.swift
+118 −31 ReactiveCocoa/Swift/Signal.swift
+13 −11 ReactiveCocoa/Swift/SignalProducer.swift
+1 −1 ReactiveCocoaTests/Objective-C/NSObjectRACSelectorSignalSpec.m
+1 −1 ReactiveCocoaTests/Objective-C/RACSequenceSpec.m
+1 −1 ReactiveCocoaTests/Objective-C/RACSerialDisposableSpec.m
+25 −0 ReactiveCocoaTests/Objective-C/RACSignalSpec.m
+4 −4 ReactiveCocoaTests/Swift/ActionSpec.swift
+96 −6 ReactiveCocoaTests/Swift/ObjectiveCBridgingSpec.swift
+7 −7 ReactiveCocoaTests/Swift/PropertySpec.swift
+495 −29 ReactiveCocoaTests/Swift/SignalProducerSpec.swift
+91 −4 ReactiveCocoaTests/Swift/SignalSpec.swift
10 changes: 5 additions & 5 deletions ReactiveTask/Task.swift
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ private final class Pipe {
}

dispatch_io_set_low_water(channel, 1)
dispatch_io_read(channel, 0, UInt.max, queue) { (done, data, error) in
dispatch_io_read(channel, 0, Int.max, queue) { (done, data, error) in
if let data = data {
sendNext(observer, data)
}
Expand Down Expand Up @@ -167,7 +167,7 @@ private final class Pipe {
disposable.addDisposable(producerDisposable)

signal.observe(next: { data in
let dispatchData = dispatch_data_create(data.bytes, UInt(data.length), queue, nil)
let dispatchData = dispatch_data_create(data.bytes, data.length, queue, nil)

dispatch_io_write(channel, 0, dispatchData, queue) { (done, data, error) in
if error != 0 {
Expand Down Expand Up @@ -201,7 +201,7 @@ private func aggregateDataReadFromPipe(pipe: Pipe, forwardingSink: SinkOf<NSData
disposable.addDisposable(signalDisposable)

signal.observe(next: { data in
forwardingSink?.put(data as NSData)
forwardingSink?.put(data as! NSData)

if let existingBuffer = buffer {
buffer = dispatch_data_create_concat(existingBuffer, data)
Expand All @@ -212,7 +212,7 @@ private func aggregateDataReadFromPipe(pipe: Pipe, forwardingSink: SinkOf<NSData
sendError(observer, error)
}, completed: {
if let buffer = buffer {
sendNext(observer, buffer as NSData)
sendNext(observer, buffer as! NSData)
} else {
sendNext(observer, NSData())
}
Expand Down Expand Up @@ -309,7 +309,7 @@ public func launchTask(taskDescription: TaskDescription, standardOutput: SinkOf<
if terminationStatus == EXIT_SUCCESS {
return success(stdoutData)
} else {
let errorString = (stderrData.length > 0 ? NSString(data: stderrData, encoding: NSUTF8StringEncoding) : nil)
let errorString = (stderrData.length > 0 ? String(UTF8String: UnsafePointer<CChar>(stderrData.bytes)) : nil)
return failure(.ShellTaskFailed(exitCode: terminationStatus, standardError: errorString))
}
}
Expand Down
2 changes: 1 addition & 1 deletion ReactiveTaskTests/TaskSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class TaskSpec: QuickSpec {

property <~ signal
|> scan(NSData()) { (accum, data) in
let buffer = accum.mutableCopy() as NSMutableData
let buffer = accum.mutableCopy() as! NSMutableData
buffer.appendData(data)

return buffer
Expand Down

0 comments on commit f03304d

Please sign in to comment.