Merge branch 'release/3.1.0'

.github/workflows/pr_check.yml

@@ -0,0 +1,22 @@
+name: PR Check
+on: [pull_request]
+concurrency: 
+  group: ${{ github.head_ref }}
+  cancel-in-progress: true
+jobs:
+  pr_check:
+    runs-on: macOS-11
+    if: github.event.pull_request.draft == false
+    steps:
+      - name: Checkout Project
+        uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Danger
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bundle exec danger
+      - name: Test
+        run: swift test
+

.gitignore

@@ -21,6 +21,7 @@ xcuserdata/
 *.moved-aside
 *.xcuserstate
 *.xcscmblueprint
+.DS_Store
 
 ## Obj-C/Swift specific
 *.hmap
@@ -53,6 +54,9 @@ Pods/
 
 Carthage/Build
 
+# SwiftPM
+.swiftpm/
+
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

.ruby-version

@@ -0,0 +1 @@
+2.7.1

CHANGELOG.md

@@ -1,6 +1,9 @@
 ## Main
 
 ##### New Features/Enhancements
+- Add Swift Package Manager Support
+  [notbenoit](https://github.com/notbenoit)
+  [#73](https://github.com/Fueled/ios-utilities/pulls/73)
 
 - Add `ActionProtocol`
 - Add `AnyAction`, allowing to type-erase any actions represented by a `ActionProtocol`

FueledUtils.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name = 'FueledUtils'
-  s.version = '3.0.0'
+  s.version = '3.1.0'
   s.summary = 'A collection of utilities used at Fueled'
   s.description = 'This is a collection of classes, extensions, methods and functions used within Fueled projects that aims at decomplexifying tasks that should be easy.'
   s.swift_version = '5'

FueledUtils/Combine/Action.swift

@@ -14,6 +14,10 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 public final class Action<Input, Output, Failure: Swift.Error> {

FueledUtils/Combine/ActionError.swift

@@ -12,6 +12,10 @@
 // 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

FueledUtils/Combine/AnyCurrentValuePublisher.swift

@@ -14,6 +14,9 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsReactiveCommon
+#endif
 
 ///
 /// A type-erasing current value publisher.
@@ -35,7 +38,7 @@ public struct AnyCurrentValuePublisher<Output, Failure: Swift.Error>: CurrentVal
 		self.receiveSubcriberClosure = { _ = $0.receive(value) }
 	}
 
-	public init<CurrentValuePublisher: FueledUtils.CurrentValuePublisher>(_ publisher: CurrentValuePublisher) where CurrentValuePublisher.Output == Output, CurrentValuePublisher.Failure == Failure {
+	public init<Publisher: CurrentValuePublisher>(_ publisher: Publisher) where Publisher.Output == Output, Publisher.Failure == Failure {
 		self.valueGetter = { publisher.value }
 		self.receiveSubcriberClosure = { publisher.receive(subscriber: $0) }
 	}

FueledUtils/Combine/CoalescingAction.swift

@@ -14,6 +14,10 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 ///
 /// Similar to `Action`, except if the action is already executing, subsequent `apply()` call will not fail,

FueledUtils/Combine/CombineExtensions+Cancellables.swift

@@ -14,6 +14,11 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import Foundation
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 private var cancellablesKey: UInt8 = 0
 

FueledUtils/Combine/ObservableObjectExtensions.swift

@@ -14,6 +14,11 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import Foundation
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension ObservableObject where Self.ObjectWillChangePublisher == ObservableObjectPublisher {

FueledUtils/Combine/Publisher+TransferState.swift

@@ -14,6 +14,10 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension Publisher where Output: TransferStateProtocol {

FueledUtils/Combine/PublisherExtensions.swift

@@ -14,6 +14,10 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension Publisher {

FueledUtils/Combine/PublishersExtensions.swift

@@ -14,6 +14,10 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
 extension Publishers {

FueledUtils/CombineOperators/Combine+Operators.swift

@@ -14,6 +14,12 @@
 
 #if canImport(Combine)
 import Combine
+#if canImport(FueledUtilsCombine)
+import FueledUtilsCombine
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+public typealias OptionalProtocol = FueledUtilsCore.OptionalProtocol
+#endif
 
 // swiftlint:disable generic_type_name
 

FueledUtils/CombineUIKit/ControlProtocol+Tapped.swift

@@ -14,6 +14,10 @@
 
 #if canImport(UIKit) && !os(watchOS) && canImport(Combine)
 import Combine
+#if canImport(FueledUtilsUIKit)
+import Foundation
+import FueledUtilsUIKit
+#endif
 
 private var tapActionStorage: UInt8 = 0
 private var tapActionKey: UInt8 = 0

FueledUtils/CombineUIKit/TapAction.swift

@@ -13,9 +13,14 @@
 // limitations under the License.
 
 #if canImport(UIKit) && !os(watchOS)
+import Foundation
+import UIKit
 #if canImport(Combine)
 import Combine
 #endif
+#if canImport(FueledUtilsCombine)
+import FueledUtilsCombine
+#endif
 
 ///
 /// `TapAction` wraps a `ActionProtocol` for use by any `ControlProtocol`.

FueledUtils/CombineUIKit/UIControl+ControlEventsPublisher.swift

@@ -15,6 +15,10 @@
 #if canImport(UIKit) && !os(watchOS) && canImport(Combine)
 import Combine
 import UIKit
+#if canImport(FueledUtilsUIKit)
+import Foundation
+import FueledUtilsUIKit
+#endif
 
 private var publisherControlEventsProcessorsHolderKey: UInt8 = 0
 

FueledUtils/CombineUIKit/UITextInput+Combine.swift

@@ -14,6 +14,12 @@
 
 #if canImport(UIKit) && !os(watchOS) && canImport(Combine)
 import Combine
+#if canImport(FueledUtilsCombine)
+import FueledUtilsCombine
+#endif
+#if canImport(FueledUtilsUIKit)
+import FueledUtilsUIKit
+#endif
 import UIKit
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)

FueledUtils/ReactiveSwift/ActionError+ActionErrorProtocol.swift

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsReactiveCommon
+#endif
 import ReactiveSwift
 
 extension ReactiveSwift.ActionError: ActionErrorProtocol {

FueledUtils/ReactiveSwift/ReactiveCoalescingAction.swift

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(FueledUtilsCore)
+import FueledUtilsCore
+#endif
 import ReactiveSwift
 
 ///

FueledUtils/ReactiveSwift/ReactiveCocoaExtensions.swift

@@ -13,11 +13,16 @@
 // limitations under the License.
 
 import Foundation
+#if canImport(FueledUtilsReactiveCommon)
+import FueledUtilsCore
+import FueledUtilsReactiveCommon
+#endif
 import ReactiveCocoa
 import ReactiveSwift
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 #elseif canImport(AppKit)
+import AppKit
 #endif
 
 ///

FueledUtils/ReactiveSwift/TransferState+Reactive.swift

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(FueledUtilsCore)
+import FueledUtilsCore
+#endif
 import ReactiveSwift
 
 extension SignalProtocol {

FueledUtils/ReactiveSwiftUIKit/ReactiveControlProtocol+Tapped.swift

@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
 #if canImport(UIKit) && !os(watchOS)
 import ReactiveCocoa
 import ReactiveSwift
+#if canImport(FueledUtilsUIKit)
+import FueledUtilsUIKit
+#endif
 
 private var tapActionStorage: UInt8 = 0
 private var tapActionKey: UInt8 = 0

FueledUtils/ReactiveSwiftUIKit/ReactiveTapAction.swift

@@ -14,6 +14,11 @@
 
 #if canImport(UIKit) && !os(watchOS)
 import ReactiveSwift
+import Foundation
+#if canImport(FueledUtilsUIKit)
+import FueledUtilsUIKit
+import FueledUtilsReactiveSwift
+#endif
 
 ///
 /// `ReactiveTapAction` wraps a `ReactiveActionProtocol` for use by any `ButtonProtocol`

FueledUtils/ReactiveSwiftUIKit/SignalingAlert.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(UIKit) && !os(watchOS)
 import Foundation
 import ReactiveCocoa
 import ReactiveSwift
@@ -107,3 +108,4 @@ public final class SignalingAlert<T> {
 		}
 	}
 }
+#endif

FueledUtils/ReactiveSwiftUIKit/UIReactiveExtensions.swift

@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(UIKit)
 import Foundation
 import ReactiveSwift
 import UIKit
+#if canImport(FueledUtilsUIKit)
+import FueledUtilsUIKit
+#endif
 
 extension Reactive where Base: UILabel {
 	///
@@ -34,3 +38,4 @@ extension Reactive where Base: UILabel {
 		}
 	}
 }
+#endif

FueledUtils/UIKit/ButtonWithTitleAdjustment.swift

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 ///
@@ -108,3 +108,4 @@ open class ButtonWithTitleAdjustment: UIButton {
 		self.setAttributedTitle(adjustedString, for: state)
 	}
 }
+#endif

FueledUtils/UIKit/DecoratingTextFieldDelegate.swift

@@ -12,8 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 import Foundation
+#if canImport(FueledUtilsCore)
+import FueledUtilsCore
+#endif
 
 ///
 /// Adds formatting (decoration) characters to text field's content according to a variable pattern. Can be used for
@@ -192,3 +196,4 @@ extension DecoratingTextFieldDelegate: UITextFieldDelegate {
 		return false
 	}
 }
+#endif

FueledUtils/UIKit/DimmingButton.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(UIKit) && !os(watchOS)
 import Foundation
 import UIKit
 
@@ -58,3 +59,4 @@ public final class DimmingButton: UIButton {
 		(view ?? self).alpha = dimmedAlpha
 	}
 }
+#endif

FueledUtils/UIKit/GradientView.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#if canImport(UIKit) && !os(watchOS)
 import UIKit
 
 ///
@@ -274,3 +275,4 @@ extension CGPoint {
 		return CGPoint(x: 1.0, y: 0.0)
 	}
 }
+#endif