Skip to content

Commit cc12ed4

Browse files
author
Guido Marucci Blas
committed
Updates project to XCode 7.1.
- updates Quick to 0.8.0 - updates Nimble to 3.0.0. - updates ReactiveCocoa to 4.0.0-alpha.2.
1 parent 9d22267 commit cc12ed4

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveCocoa/ReactiveCocoa" "8ebff4f192ad11dfc62c55e8151c235d005f390b"
1+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"

Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Nimble" "v2.0.0-rc.3"
2-
github "Quick/Quick" ~> 0.6.0
1+
github "Quick/Nimble" ~> 3.0.0
2+
github "Quick/Quick" ~> 0.8.0

Cartfile.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "Quick/Nimble" "v2.0.0-rc.3"
2-
github "Quick/Quick" "v0.6.0"
3-
github "antitypical/Result" "76f9a972ed61ff872b731460bc610c8acbfae58c"
4-
github "ReactiveCocoa/ReactiveCocoa" "8ebff4f192ad11dfc62c55e8151c235d005f390b"
1+
github "Quick/Nimble" "v3.0.0"
2+
github "Quick/Quick" "v0.8.0"
3+
github "antitypical/Result" "0.6.0-beta.3"
4+
github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"

ReactiveArray/ReactiveArray.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final class ReactiveArray<T>: CollectionType, MutableCollectionType, Cust
3939
}
4040

4141
private let _mutableCount: MutableProperty<Int>
42-
public let observableCount:PropertyOf<Int>
42+
public let observableCount:AnyProperty<Int>
4343

4444
public var isEmpty: Bool {
4545
return _elements.isEmpty
@@ -78,7 +78,7 @@ public final class ReactiveArray<T>: CollectionType, MutableCollectionType, Cust
7878
public init(elements:[T]) {
7979
_elements = elements
8080
_mutableCount = MutableProperty(elements.count)
81-
observableCount = PropertyOf(_mutableCount)
81+
observableCount = AnyProperty(_mutableCount)
8282

8383
_signal.observe { [unowned self](event) in
8484
if case .Next(let operation) = event {
@@ -109,22 +109,22 @@ public final class ReactiveArray<T>: CollectionType, MutableCollectionType, Cust
109109

110110
public func append(element: T) {
111111
let operation: Operation<T> = .Append(value: element)
112-
_sink(Event.Next(operation))
112+
_sink.sendNext(operation)
113113
}
114114

115115
public func insert(newElement: T, atIndex index : Int) {
116116
let operation: Operation<T> = .Insert(value: newElement, atIndex: index)
117-
_sink(Event.Next(operation))
117+
_sink.sendNext(operation)
118118
}
119119

120120
public func update(element: T, atIndex index: Int) {
121121
let operation: Operation<T> = .Update(value: element, atIndex: index)
122-
_sink(Event.Next(operation))
122+
_sink.sendNext(operation)
123123
}
124124

125125
public func removeAtIndex(index:Int) {
126126
let operation: Operation<T> = .RemoveElement(atIndex: index)
127-
_sink(Event.Next(operation))
127+
_sink.sendNext(operation)
128128
}
129129

130130
public func mirror<U>(transformer: T -> U) -> ReactiveArray<U> {

0 commit comments

Comments
 (0)