Merge pull request #87 from Fueled/refactor/remove-can-import-checks

Remove non-needed canImport checks
Fueled · Jan 8, 2024 · 0311b12 · 0311b12
2 parents 580e55d + fa45d6f
commit 0311b12
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 65 deletions.
diff --git a/Sources/FueledUtils/Combine/ActionError.swift b/Sources/FueledUtils/Combine/ActionError.swift
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(FueledUtilsReactiveCommon)
-import FueledUtilsReactiveCommon
-#endif
-
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 public enum ActionError<Error: Swift.Error>: Swift.Error {
 	case disabled

diff --git a/Sources/FueledUtils/Combine/ActionProtocol.swift b/Sources/FueledUtils/Combine/ActionProtocol.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -105,5 +104,3 @@ extension ActionProtocol where Input == Void {
 		return self.apply(())
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/AnyAction.swift b/Sources/FueledUtils/Combine/AnyAction.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 ///
@@ -64,5 +63,3 @@ public final class AnyAction: ActionProtocol {
 		self.applyClosure(input)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/AnyCurrentValuePublisher.swift b/Sources/FueledUtils/Combine/AnyCurrentValuePublisher.swift
@@ -12,11 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
-#if canImport(FueledUtilsReactiveCommon)
-import FueledUtilsReactiveCommon
-#endif
 
 ///
 /// A type-erasing current value publisher.
@@ -27,24 +23,24 @@ import FueledUtilsReactiveCommon
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 public struct AnyCurrentValuePublisher<Output, Failure: Swift.Error>: CurrentValuePublisher {
 	private let valueGetter: () -> Output
-	private let receiveSubcriberClosure: (AnySubscriber<Output, Failure>) -> Void
+	private let receiveSubscriberClosure: (AnySubscriber<Output, Failure>) -> Void
 
 	public var value: Output {
 		self.valueGetter()
 	}
 
 	public init(_ value: Output) {
 		self.valueGetter = { value }
-		self.receiveSubcriberClosure = { _ = $0.receive(value) }
+		self.receiveSubscriberClosure = { _ = $0.receive(value) }
 	}
 
 	public init<Publisher: CurrentValuePublisher>(_ publisher: Publisher) where Publisher.Output == Output, Publisher.Failure == Failure {
 		self.valueGetter = { publisher.value }
-		self.receiveSubcriberClosure = { publisher.receive(subscriber: $0) }
+		self.receiveSubscriberClosure = { publisher.receive(subscriber: $0) }
 	}
 
 	public func receive<Subscriber: Combine.Subscriber>(subscriber: Subscriber) where Subscriber.Input == Output, Subscriber.Failure == Failure {
-		self.receiveSubcriberClosure(subscriber.eraseToAnySubscriber())
+		self.receiveSubscriberClosure(subscriber.eraseToAnySubscriber())
 	}
 }
 
@@ -66,5 +62,3 @@ public protocol CurrentValuePublisher: Publisher {
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension CurrentValueSubject: CurrentValuePublisher {
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/CombineOperators/CombineOperators+Optional.swift b/Sources/FueledUtils/Combine/CombineOperators/CombineOperators+Optional.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -50,5 +49,3 @@ public func >>> (lhs: AnyCancellable?, rhs: inout Set<AnyCancellable>?) {
 	}
 	lhs >>> rhs
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/OverridingAction.swift b/Sources/FueledUtils/Combine/OverridingAction.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 ///
@@ -101,5 +100,3 @@ public class OverridingAction<Input, Output, Failure: Swift.Error>: ActionProtoc
 			.eraseToAnyPublisher()
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Published+PublisherInit.swift b/Sources/FueledUtils/Combine/Published+PublisherInit.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -47,5 +46,3 @@ extension Published {
 		return publisher
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Publisher+AdditionalHandleEvents.swift b/Sources/FueledUtils/Combine/Publisher+AdditionalHandleEvents.swift
@@ -5,7 +5,6 @@
 //  Created by Stéphane Copin on 10/14/20.
 //
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -102,5 +101,3 @@ extension Publisher {
 		)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Publisher+CombinePrevious.swift b/Sources/FueledUtils/Combine/Publisher+CombinePrevious.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -43,5 +42,3 @@ extension Publisher {
 			.eraseToAnyPublisher()
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Publisher+IgnoreRepeats.swift b/Sources/FueledUtils/Combine/Publisher+IgnoreRepeats.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -30,5 +29,3 @@ extension Publisher where Output: Equatable {
 		self.removeDuplicates(by: ==).eraseToAnyPublisher()
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Subject+SendResult.swift b/Sources/FueledUtils/Combine/Subject+SendResult.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -27,5 +26,3 @@ extension Subject {
 		}
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/Combine/Subscriber+EraseToAnySubscriber.swift b/Sources/FueledUtils/Combine/Subscriber+EraseToAnySubscriber.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(Combine)
 import Combine
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -21,5 +20,3 @@ extension Subscriber {
 		AnySubscriber(self)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/BackgroundBlur.swift b/Sources/FueledUtils/SwiftUI/BackgroundBlur.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -51,5 +50,3 @@ extension View {
 	}
 	#endif
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/Binding+KeyPath.swift b/Sources/FueledUtils/SwiftUI/Binding+KeyPath.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -28,5 +27,3 @@ extension Binding {
 		)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/BlurView.swift b/Sources/FueledUtils/SwiftUI/BlurView.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 #if canImport(UIKit)
 import UIKit
@@ -74,5 +73,3 @@ public struct BlurView: NSViewRepresentable {
 }
 
 #endif
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/EdgeInsets+Helpers.swift b/Sources/FueledUtils/SwiftUI/EdgeInsets+Helpers.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -34,5 +33,3 @@ extension EdgeInsets {
 		)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/ForEachWithIndex.swift b/Sources/FueledUtils/SwiftUI/ForEachWithIndex.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -72,5 +71,3 @@ private struct IndexInfo<Index, Element, ID: Hashable>: Hashable {
 		self.elementID.hash(into: &hasher)
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/FramePreferenceKey.swift b/Sources/FueledUtils/SwiftUI/FramePreferenceKey.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 ///
@@ -29,5 +28,3 @@ public struct FramePreferenceKey<TagType>: PreferenceKey {
 		value = nextValue()
 	}
 }
-
-#endif
diff --git a/Sources/FueledUtils/SwiftUI/View+AnyView.swift b/Sources/FueledUtils/SwiftUI/View+AnyView.swift
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if canImport(SwiftUI)
 import SwiftUI
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
@@ -21,5 +20,3 @@ extension View {
 		AnyView(self)
 	}
 }
-
-#endif