From 680226af3a8c0adbe9766938787ffb40f5c15884 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Thu, 26 Dec 2024 10:59:48 +0100 Subject: [PATCH] Update workflows --- .github/workflows/flare.yml | 2 +- .github/workflows/flare_ui.yml | 2 +- .../Extensions/SKRequest+Identifier.swift | 6 +++++- Sources/Flare/Classes/Flare.swift | 6 +++++- .../TestHelpers/Mocks/PurchaseProviderMock.swift | 16 ++++++++++++---- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flare.yml b/.github/workflows/flare.yml index 9f23ef429..134f098d0 100644 --- a/.github/workflows/flare.yml +++ b/.github/workflows/flare.yml @@ -198,7 +198,7 @@ jobs: discover-typos: name: Discover Typos - runs-on: macOS-12 + runs-on: macOS-13 env: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: diff --git a/.github/workflows/flare_ui.yml b/.github/workflows/flare_ui.yml index d0fa04285..2c4670a7e 100644 --- a/.github/workflows/flare_ui.yml +++ b/.github/workflows/flare_ui.yml @@ -236,7 +236,7 @@ jobs: discover-typos: name: Discover Typos - runs-on: macOS-12 + runs-on: macOS-13 env: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: diff --git a/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift b/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift index 6952db402..74c7140d7 100644 --- a/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift +++ b/Sources/Flare/Classes/Extensions/SKRequest+Identifier.swift @@ -5,7 +5,11 @@ import StoreKit -private nonisolated(unsafe) var requestIdKey: UInt = 0 +#if swift(>=6.0) + private nonisolated(unsafe) var requestIdKey: UInt = 0 +#else + private var requestIdKey: UInt = 0 +#endif extension SKRequest { var id: String { diff --git a/Sources/Flare/Classes/Flare.swift b/Sources/Flare/Classes/Flare.swift index 2a7d44a80..c766018f6 100644 --- a/Sources/Flare/Classes/Flare.swift +++ b/Sources/Flare/Classes/Flare.swift @@ -23,7 +23,11 @@ public final class Flare { private let configurationProvider: IConfigurationProvider /// The singleton instance. - private nonisolated(unsafe) static let flare: Flare = .init() + #if swift(>=6.0) + private nonisolated(unsafe) static let flare: Flare = .init() + #else + private static let flare: Flare = .init() + #endif /// Returns a shared `Flare` object. public static var shared: IFlare { flare } diff --git a/Tests/FlareTests/UnitTests/TestHelpers/Mocks/PurchaseProviderMock.swift b/Tests/FlareTests/UnitTests/TestHelpers/Mocks/PurchaseProviderMock.swift index 9f141f4d7..df42fa8a0 100644 --- a/Tests/FlareTests/UnitTests/TestHelpers/Mocks/PurchaseProviderMock.swift +++ b/Tests/FlareTests/UnitTests/TestHelpers/Mocks/PurchaseProviderMock.swift @@ -52,9 +52,13 @@ final class PurchaseProviderMock: IPurchaseProvider, @unchecked Sendable { invokedPurchaseParameters = (product, promotionalOffer) invokedPurchaseParametersList.append((product, promotionalOffer)) if let result = stubbedPurchaseCompletionResult { - MainActor.assumeIsolated { + #if swift(>=6.0) + MainActor.assumeIsolated { + completion(result.0) + } + #else completion(result.0) - } + #endif } } @@ -77,9 +81,13 @@ final class PurchaseProviderMock: IPurchaseProvider, @unchecked Sendable { invokedPurchaseWithOptionsParametersList.append((product, options, promotionalOffer)) if let result = stubbedinvokedPurchaseWithOptionsCompletionResult { - MainActor.assumeIsolated { + #if swift(>=6.0) + MainActor.assumeIsolated { + completion(result.0) + } + #else completion(result.0) - } + #endif } }