Fix carthage support

RxSwiftCommunity · Mar 23, 2021 · 3d8aae5 · 3d8aae5
1 parent 54af729
commit 3d8aae5
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 57 deletions.
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "6.0.0"
+github "ReactiveX/RxSwift" "6.1.0"
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -26,10 +26,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
-  RxGesture: 11c8959d9161deb7da24a12e91f3ebdf40256747
+  RxGesture: b095a86df33d199a33b46a644e7c58bdef8ab035
   RxRelay: 8d593be109c06ea850df027351beba614b012ffb
   RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
 
 PODFILE CHECKSUM: d48d39de6335e342c666df2ee12e4efb3d005eb3
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
diff --git a/Pod/Classes/GenericRxGestureRecognizerDelegate.swift b/Pod/Classes/GenericRxGestureRecognizerDelegate.swift
@@ -54,13 +54,13 @@ public struct GestureRecognizerDelegatePolicy<PolicyInput> {
 }
 
 public func || <PolicyInput>(lhs: GestureRecognizerDelegatePolicy<PolicyInput>, rhs: GestureRecognizerDelegatePolicy<PolicyInput>) -> GestureRecognizerDelegatePolicy<PolicyInput>  {
-    return .custom { input in
+    .custom { input in
         lhs.isPolicyPassing(with: input) || rhs.isPolicyPassing(with: input)
     }
 }
 
 public func && <PolicyInput>(lhs: GestureRecognizerDelegatePolicy<PolicyInput>, rhs: GestureRecognizerDelegatePolicy<PolicyInput>) -> GestureRecognizerDelegatePolicy<PolicyInput>  {
-    return .custom { input in
+    .custom { input in
         lhs.isPolicyPassing(with: input) && rhs.isPolicyPassing(with: input)
     }
 }

diff --git a/Pod/Classes/iOS/ForceTouchGestureRecognizer.swift b/Pod/Classes/iOS/ForceTouchGestureRecognizer.swift
@@ -8,11 +8,11 @@ public class ForceTouchGestureRecognizer: UIGestureRecognizer {
 
     private var touch: UITouch?
     public var force: CGFloat {
-        return touch?.force ?? 0
+        touch?.force ?? 0
     }
 
     public var maximumPossibleForce: CGFloat {
-        return touch?.maximumPossibleForce ?? 0
+        touch?.maximumPossibleForce ?? 0
     }
 
     public var absoluteFractionCompleted: CGFloat {
@@ -26,7 +26,7 @@ public class ForceTouchGestureRecognizer: UIGestureRecognizer {
     public var maximumFractionCompletedRequired: CGFloat = 1
 
     public var fractionCompleted: CGFloat {
-        return lerp(
+        lerp(
             mapMin: minimumFractionCompletedRequired, to: 0,
             mapMax: maximumFractionCompletedRequired, to: 1,
             value: absoluteFractionCompleted
@@ -104,7 +104,7 @@ extension ObservableType where Element: ForceTouchGestureRecognizer {
         return source
             .when(.began)
             .flatMapLatest { [unowned source] _ in
-                return source
+                source
                     .when(.changed)
                     .filter {
                         if threshold == 0 {
@@ -119,11 +119,11 @@ extension ObservableType where Element: ForceTouchGestureRecognizer {
 }
 
 private func lerp<T : FloatingPoint>(_ v0: T, _ v1: T, _ t: T) -> T {
-    return v0 + (v1 - v0) * t
+    v0 + (v1 - v0) * t
 }
 
 private func lerp<T : FloatingPoint>(mapMin: T, to min: T, mapMax: T, to max: T, value: T) -> T {
-    return  lerp(min, max, (value - mapMin) / (mapMax - mapMin))
+    lerp(min, max, (value - mapMin) / (mapMax - mapMin))
 }
 
 #endif
diff --git a/RxGesture/RxGesture.xcodeproj/project.pbxproj b/RxGesture/RxGesture.xcodeproj/project.pbxproj
diff --git a/bin/setup b/bin/setup
@@ -6,4 +6,4 @@ if ! command -v carthage > /dev/null; then
   exit 1
 fi
 
-carthage update --use-submodules --no-use-binaries
+carthage update --use-xcframeworks --use-submodules --no-use-binaries
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "ReactiveX/RxSwift" "6.0.0"
		github "ReactiveX/RxSwift" "6.1.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ if ! command -v carthage > /dev/null; then @@
       exit 1
     fi
-    carthage update --use-submodules --no-use-binaries
+    carthage update --use-xcframeworks --use-submodules --no-use-binaries