diff --git a/.circleci/config.yml b/.circleci/config.yml index 52f928e..5b55daa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,12 +4,12 @@ version: 2.1 anchors: - - &test_device "iPhone 14" - - &test_device_os "16.2" + - &test_device "iPhone 15" + - &test_device_os "17.0" - &clean_before_build true - &default_executor macos: - xcode: "14.2.0" + xcode: "15.0.0" env: global: @@ -61,6 +61,8 @@ commands: workspace: "Example.xcworkspace" scheme: "Example" path: <> + simulator: "iPhone 14" + os_version: "16.0" # We introduced two separate commands for projects and workspaces because we didn't find a generic and non-confusing way to introduce # a condition to only pass either the project or the workspace environment argument to the test output @@ -145,21 +147,25 @@ jobs: - store_test_results: path: swiftlint.html - test-xcode13-ios15: + test-xcode14-ios16: macos: - xcode: "13.0.0" + xcode: "14.0.0" steps: - test_main_project: - simulator: "iPhone 13" - os_version: "15.0" + simulator: "iPhone 14" + os_version: "16.0" - test-xcode14-ios16: + test-xcode15-ios17: <<: *default_executor steps: - test_main_project test-example-login: - <<: *default_executor + # can not use xcode > 14 since we have this error. + # deprecate to_default_s: :to_s, deprecator: ActiveSupport.deprecator + # to solve it we need to update the podspec. + macos: + xcode: "14.0.0" steps: - test_example_project: path: Examples/login @@ -170,7 +176,8 @@ workflows: jobs: - swiftlint: version: 0.49.1 - - test-xcode13-ios15 - test-xcode14-ios16 + # Disable untill we fix test for Xcode 15 + # - test-xcode15-ios17 - test-example-login diff --git a/Flow/Bridges/Signal+Combine.swift b/Flow/Bridges/Signal+Combine.swift index 19dca37..6df2a3b 100644 --- a/Flow/Bridges/Signal+Combine.swift +++ b/Flow/Bridges/Signal+Combine.swift @@ -11,7 +11,7 @@ extension CoreSignal { final class SignalPublisher: Publisher, Cancellable { typealias Output = Value typealias Failure = Error - + internal var signal: CoreSignal internal var bag: CancelBag @@ -22,7 +22,7 @@ extension CoreSignal { func receive( subscriber: S - ) where S : Subscriber, Failure == S.Failure, Value == S.Input { + ) where S: Subscriber, Failure == S.Failure, Value == S.Input { // Creating our custom subscription instance: let subscription = EventSubscription() subscription.target = subscriber @@ -56,11 +56,11 @@ extension CoreSignal { cancel() } } - + @available(iOS 13.0, macOS 10.15, *) final class EventSubscription: Subscription where Target.Input == Value { - + var target: Target? func request(_ demand: Subscribers.Demand) {} @@ -76,12 +76,12 @@ extension CoreSignal { _ = target?.receive(completion: .finished) } } - + func trigger(for value: Value) { _ = target?.receive(value) } } - + @available(iOS 13.0, macOS 10.15, *) public var asAnyPublisher: AnyPublisher { SignalPublisher(signal: self).eraseToAnyPublisher() diff --git a/Flow/Bridges/Signal+SwiftUI.swift b/Flow/Bridges/Signal+SwiftUI.swift index 7198567..f9198f6 100644 --- a/Flow/Bridges/Signal+SwiftUI.swift +++ b/Flow/Bridges/Signal+SwiftUI.swift @@ -33,6 +33,6 @@ extension CoreSignal where Kind == Read { set: { _ in } ) } - + } #endif diff --git a/README.md b/README.md index 74f77ad..97c42ac 100644 --- a/README.md +++ b/README.md @@ -231,4 +231,4 @@ Flow was developed, evolved and field-tested over the course of several years, a ## Collaborate -You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [ios-oss@izettle.com](mailto:ios-oss@izettle.com) +You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [iz-apps-platform-ios@paypal.com](mailto:iz-apps-platform-ios@paypal.com)