Merge pull request #12 from Carthage/swift-1.2

Swift 1.2b3

Author: robrix

.travis.yml

@@ -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

Cartfile

@@ -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

Cartfile.private

@@ -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"

Cartfile.resolved

@@ -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)
 				}
@@ -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 {
@@ -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)
@@ -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())
 				}
@@ -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))
 						}
 					}

Carthage/Checkouts/LlamaKit

@@ -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