diff --git a/.gitignore b/.gitignore index d2abbec..660e707 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ DerivedData Carthage Demo/Pods -.ruby-version .ruby-gemset # Swift Package Manager .build diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..bea438e --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.3.1 diff --git a/Gemfile b/Gemfile index 642d761..73e1c77 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,6 @@ # frozen_string_literal: true +gem 'fastlane', '2.219.0' + ci_gems_path = File.join(File.dirname(__FILE__), "Submodules/WeTransfer-iOS-CI/Gemfile") eval_gemfile(ci_gems_path) if File.exist?(ci_gems_path) diff --git a/Gemfile.lock b/Gemfile.lock index 8d5acdd..d123cac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,221 @@ GEM remote: https://rubygems.org/ specs: - dotenv (2.7.6) + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.962.0) + aws-sdk-core (3.201.3) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.157.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.111.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.219.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.6) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.3.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.5.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.9) + strscan + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + strscan (3.1.0) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.5.0) + word_wrap (1.0.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) PLATFORMS - arm64-darwin-21 + arm64-darwin-23 ruby - universal-darwin-20 - x86_64-darwin-19 DEPENDENCIES dotenv + fastlane (= 2.219.0) BUNDLED WITH - 2.2.0 + 2.5.9 diff --git a/Sources/UINotificationRequest.swift b/Sources/UINotificationRequest.swift index f50f676..3af830d 100644 --- a/Sources/UINotificationRequest.swift +++ b/Sources/UINotificationRequest.swift @@ -9,7 +9,7 @@ import Foundation protocol UINotificationRequestDelegate: AnyObject { - + /// Notifies of a change inside the passed `UINotificationRequest` state. /// /// - Parameters: @@ -21,35 +21,35 @@ protocol UINotificationRequestDelegate: AnyObject { /// Defines the request of a notification presentation. /// Can be in idle, running or finished state. Can also be in a cancelled state if `cancel()` is called. public final class UINotificationRequest: Equatable, @unchecked Sendable { - /// The queue which is used to make sure the requests array is only modified serially. - private static let lockQueue = DispatchQueue(label: "com.uinotifications.request.LockQueue") - public enum State { /// Waiting to run case idle - + /// Currently running case running - + /// Finished case finished - + /// Cancelled case cancelled } - + + /// The queue which is used to make sure the requests array is only modified serially. + private static let lockQueue = DispatchQueue(label: "com.uinotifications.request.LockQueue") + /// The notification which is requested for presentation. public let notification: UINotification - + /// Optional dismiss trigger to use for the animation. If `nil` the default trigger will be used. public let dismissTrigger: UINotificationDismissTrigger? /// The type of view to use for this notification. public let notificationViewType: UINotificationView.Type - - /// An internal intedifier used for comparing actions + + /// An internal identifier used for comparing actions private let identifier: UUID - + /// The current state of the request. private(set) var state: UINotificationRequest.State { get { @@ -67,18 +67,23 @@ public final class UINotificationRequest: Equatable, @unchecked Sendable { /// since the delegate will always exist since it's the `UINotificationQueue`. private let delegate: UINotificationRequestDelegate - internal init(notification: UINotification, delegate: UINotificationRequestDelegate, notificationViewType: UINotificationView.Type, dismissTrigger: UINotificationDismissTrigger? = nil) { + internal init( + notification: UINotification, + delegate: UINotificationRequestDelegate, + notificationViewType: UINotificationView.Type, + dismissTrigger: UINotificationDismissTrigger? = nil + ) { self.notification = notification self.delegate = delegate self.notificationViewType = notificationViewType self.dismissTrigger = dismissTrigger self.identifier = UUID() } - + internal func start() { state = .running } - + /// Set's the state of the request to cancelled, which will trigger a cancel. public func cancel() { guard state == .idle else { @@ -87,11 +92,11 @@ public final class UINotificationRequest: Equatable, @unchecked Sendable { } state = .cancelled } - + internal func finish() { state = .finished } - + nonisolated public static func == (lhs: UINotificationRequest, rhs: UINotificationRequest) -> Bool { return lhs.identifier == rhs.identifier } diff --git a/Submodules/WeTransfer-iOS-CI b/Submodules/WeTransfer-iOS-CI index 0217428..f79e831 160000 --- a/Submodules/WeTransfer-iOS-CI +++ b/Submodules/WeTransfer-iOS-CI @@ -1 +1 @@ -Subproject commit 02174285440b63e3c1a3a0fda3505308120d28e4 +Subproject commit f79e831c7513ea793be388062503d3da2a2e4dfd