Skip to content

Commit

Permalink
fix broken compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
Mordil committed Dec 7, 2020
1 parent cc6c5a0 commit 56ac7e8
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 681 files
6 changes: 3 additions & 3 deletions Pod/Classes/GestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
import RxSwift
import RxCocoa

extension ObservableType where E: GestureRecognizer {
extension ObservableType where Element: GestureRecognizer {

/**
Filters the observable `GestureRecognizer` events sequence based on the `GestureRecognizer` state.

- parameter state: An `GestureRecognizerState` that is used to filter the `GestureRecognizer` events sequence.
- returns: An observable `GestureRecognizer` events sequence that only contains events emitted while the `GestureRecognizer`'s state match the given `state`.
*/
public func when(_ states: GestureRecognizerState...) -> Observable<E> {
public func when(_ states: GestureRecognizerState...) -> Observable<Element> {
return filter { gesture in
return states.contains(gesture.state)
}
Expand All @@ -41,7 +41,7 @@ extension ObservableType where E: GestureRecognizer {
- parameter state: An `GestureRecognizerState` that is used to filter the `GestureRecognizer` events sequence.
- returns: An observable `GestureRecognizer` events sequence that only contains events emitted while the `GestureRecognizer`'s state match the given `state`.
*/
internal func when(_ states: [GestureRecognizerState]) -> Observable<E> {
internal func when(_ states: [GestureRecognizerState]) -> Observable<Element> {
return filter { gesture in
return states.contains(gesture.state)
}
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/View+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extension Reactive where Base: View {
guard let gesture = gesture else { return }
control?.removeGestureRecognizer(gesture)
})
.takeUntil(control.rx.deallocated)
.take(until: control.rx.deallocated)
}

return ControlEvent(events: source)
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/iOS/ForceTouchGestureRecognizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ extension Reactive where Base: View {
}

@available(iOS 9.0, *)
extension ObservableType where E: ForceTouchGestureRecognizer {
extension ObservableType where Element: ForceTouchGestureRecognizer {

/**
Maps the observable `GestureRecognizer` events sequence to an observable sequence of force values.
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/iOS/TouchDownGestureRecognizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension Reactive where Base: View {
}
}

extension ObservableType where E: TouchDownGestureRecognizer {
extension ObservableType where Element: TouchDownGestureRecognizer {

/**
Maps the observable `GestureRecognizer` events sequence to an observable sequence of force values.
Expand Down
4 changes: 2 additions & 2 deletions Pod/Classes/iOS/TransformGestureRecognizers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ extension Reactive where Base: View {
}
}

extension ObservableType where E == TransformGestureRecognizers {
extension ObservableType where Element == TransformGestureRecognizers {

public func when(_ states: GestureRecognizerState...) -> Observable<E> {
public func when(_ states: GestureRecognizerState...) -> Observable<Element> {
return filter { gestures in
return states.contains(gestures.panGesture.state)
|| states.contains(gestures.rotationGesture.state)
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/iOS/UIPanGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension Reactive where Base: View {
}
}

extension ObservableType where E: UIPanGestureRecognizer {
extension ObservableType where Element: UIPanGestureRecognizer {

/**
Maps the observable `GestureRecognizer` events sequence to an observable sequence of translation values of the pan gesture in the coordinate system of the specified `view` alongside the gesture velocity.
Expand Down
2 changes: 1 addition & 1 deletion Pod/Classes/iOS/UIPinchGestureRecognizer+RxGesture.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension Reactive where Base: View {
}
}

extension ObservableType where E: UIPinchGestureRecognizer {
extension ObservableType where Element: UIPinchGestureRecognizer {

/**
Maps the observable `GestureRecognizer` events sequence to an observable sequence of scale factors relative to the points of the two touches in screen coordinates alongside the gesture velocity.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension Reactive where Base: View {
}
}

extension ObservableType where E: UIRotationGestureRecognizer {
extension ObservableType where Element: UIRotationGestureRecognizer {

/**
Maps the observable `GestureRecognizer` events sequence to an observable sequence of rotation values of the gesture in radians alongside the gesture velocity.
Expand Down
5 changes: 3 additions & 2 deletions RxGesture/RxGesture.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = F4CC4C131DEBA895009ED835;
Expand Down Expand Up @@ -600,7 +601,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -655,7 +656,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down

0 comments on commit 56ac7e8

Please sign in to comment.