Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .github/workflows/flare-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,17 @@ jobs:
include:
# macOS
- { platform: macOS, name: "macOS 26, Xcode 26.5, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "platform=macOS", testPlan: "FlareUIUnitTests" }
- { platform: macOS, name: "macOS 14, Xcode 16.0, Swift 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "platform=macOS", testPlan: "FlareUIUnitTests"}
- { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS", testPlan: "FlareUIUnitTests" }
- { platform: macOS, name: "macOS 15, Xcode 16.4, Swift 6.0.2", xcode: "Xcode_16.4", runsOn: macOS-15, destination: "platform=macOS", testPlan: "FlareUIUnitTests"}

# iOS
- { platform: iOS, name: "iOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=iPhone 17 Pro", testPlan: "FlareUIUnitTests" }
- { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro", testPlan: "FlareUIUnitTests" }
- { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro", testPlan: "FlareUIUnitTests" }

# tvOS
- { platform: tvOS, name: "tvOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple TV", testPlan: "FlareUIUnitTests" }
- { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV", testPlan: "FlareUIUnitTests" }
- { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV", testPlan: "FlareUIUnitTests" }

# watchOS
- { platform: watchOS, name: "watchOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple Watch Ultra 3 (49mm)", testPlan: "FlareUIUnitTests" }
- { platform: watchOS, name: "watchOS 11.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=11.1,name=Apple Watch Series 10 (46mm)", testPlan: "FlareUIUnitTests" }
- { platform: watchOS, name: "watchOS 10.5", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.5,name=Apple Watch Series 9 (45mm)", testPlan: "FlareUIUnitTests" }
- { platform: watchOS, name: "watchOS 11.5", xcode: "Xcode_16.4", runsOn: macOS-15, destination: "OS=11.5,name=Apple Watch Series 10 (46mm)", testPlan: "FlareUIUnitTests" }
steps:
- name: Checkout code
uses: actions/checkout@v7
Expand Down Expand Up @@ -88,8 +82,7 @@ jobs:
matrix:
include:
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26 }
- { name: "macOS 14, SPM 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14 }
- { name: "macOS 14, SPM 5.10.0", xcode: "Xcode_15.3", runsOn: macOS-14 }
- { name: "macOS 15, SPM 6.0.2", xcode: "Xcode_16.4", runsOn: macOS-15 }
steps:
- name: Checkout code
uses: actions/checkout@v7
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/flare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,18 @@ jobs:
include:
# macOS
- { platform: macOS, name: "macOS 26, Xcode 26.5, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "platform=macOS", testPlan: "UnitTests" }
- { platform: macOS, name: "macOS 14, Xcode 16.1, Swift 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "platform=macOS", testPlan: "UnitTests" }
- { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS", testPlan: "UnitTests" }
- { platform: macOS, name: "macOS 15, Xcode 16.4, Swift 6.0.2", xcode: "Xcode_16.4", runsOn: macOS-15, destination: "platform=macOS", testPlan: "UnitTests" }

# iOS
- { platform: iOS, name: "iOS 26.2, Xcode 26.2, Swift 6.2.0", xcode: "Xcode_26.2", runsOn: macOS-26, destination: "OS=26.2,name=iPhone 17 Pro", testPlan: "AllTests" }
- { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro", testPlan: "AllTests" }
- { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro", testPlan: "AllTests" }

# tvOS
# Pinned to 26.2 for the same reason as the iOS 26.2 leg above (StoreKitTest CLI-sync bug on 26.3+).
- { platform: tvOS, name: "tvOS 26.2", xcode: "Xcode_26.2", runsOn: macOS-26, destination: "OS=26.2,name=Apple TV", testPlan: "AllTests" }
- { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV", testPlan: "AllTests" }
- { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV", testPlan: "AllTests" }

# watchOS
- { platform: watchOS, name: "watchOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple Watch Ultra 3 (49mm)", testPlan: "UnitTests" }
- { platform: watchOS, name: "watchOS 11.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=11.1,name=Apple Watch Series 10 (46mm)", testPlan: "UnitTests" }
- { platform: watchOS, name: "watchOS 10.5", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.5,name=Apple Watch Series 9 (45mm)", testPlan: "UnitTests" }
- { platform: watchOS, name: "watchOS 11.5", xcode: "Xcode_16.4", runsOn: macOS-15, destination: "OS=11.5,name=Apple Watch Series 10 (46mm)", testPlan: "UnitTests" }
steps:
- name: Checkout code
uses: actions/checkout@v7
Expand Down Expand Up @@ -88,9 +82,7 @@ jobs:
matrix:
include:
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26 }
- { name: "macOS 15, SPM 6.0.2", xcode: "Xcode_16.0", runsOn: macOS-15 }
- { name: "macOS 14, SPM 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14 }
- { name: "macOS 14, SPM 5.10.0", xcode: "Xcode_15.3", runsOn: macOS-14 }
- { name: "macOS 15, SPM 6.0.2", xcode: "Xcode_16.4", runsOn: macOS-15 }
steps:
- name: Checkout code
uses: actions/checkout@v7
Expand Down
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Use 'swiftformat --options' to list all of the possible options

--header "\nFlare\nCopyright © {created.year} Space Code. All rights reserved.\n//"
--header "\nFlare\nCopyright © 2024 Space Code. All rights reserved.\n//"

--enable blankLinesBetweenScopes
--enable blankLinesAtStartOfScope
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
source "https://rubygems.org"

gem 'danger'
gem 'danger'
# git 5.x breaks danger 9.6.1 (uninitialized constant Git::Base)
gem 'git', '~> 4.4'
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GEM
faraday (>= 0.8)
faraday-net_http (3.5.0)
net-http (~> 0.5)
git (5.6.0)
git (4.4.6)
activesupport (>= 5.0)
addressable (~> 2.8)
process_executer (~> 4.1)
Expand Down Expand Up @@ -105,6 +105,7 @@ PLATFORMS

DEPENDENCIES
danger
git (~> 4.4)

BUNDLED WITH
2.4.21
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let package = Package(
.library(name: "FlareUI", targets: ["FlareUI"]),
],
dependencies: [
.package(url: "https://github.com/space-code/concurrency.git", exact: "0.3.1"),
.package(url: "https://github.com/space-code/concurrency.git", exact: "0.4.0"),
.package(url: "https://github.com/apple/swift-docc-plugin", exact: "1.5.0"),
.package(url: "https://github.com/space-code/log.git", exact: "1.3.0"),
.package(url: "https://github.com/space-code/atomic.git", exact: "1.1.1"),
Expand Down
4 changes: 2 additions & 2 deletions Sources/Flare/Classes/Common/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ enum Logger {

private static var defaultLogLevel: LogLevel {
#if DEBUG
return .debug
.debug
#else
return .info
.info
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Common/Types.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ extension Locale {
var currencyCodeID: String? {
#if swift(>=5.9)
if #available(macOS 13, iOS 16, tvOS 16, watchOS 9, visionOS 1.0, *) {
return self.currency?.identifier
self.currency?.identifier
} else {
return currencyCode
currencyCode
}
#else
return currencyCode
currencyCode
#endif
}
}
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Extensions/SKProduct+.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Flare.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import struct Log.LogLevel
Expand Down
4 changes: 2 additions & 2 deletions Sources/Flare/Classes/Generated/Strings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ extension L10n {
private final class BundleToken {
static let bundle: Bundle = {
#if SWIFT_PACKAGE
return Bundle.module
Bundle.module
#else
return Bundle(for: BundleToken.self)
Bundle(for: BundleToken.self)
#endif
}()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

#if canImport(UIKit)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/IFlare.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extension TransactionListener: ITransactionListener {
func handle(purchaseResult: Product.PurchaseResult) async throws -> StoreTransaction? {
switch purchaseResult {
case let .success(verificationResult):
return try await handle(transactionResult: verificationResult, fromTransactionUpdate: false)
try await handle(transactionResult: verificationResult, fromTransactionUpdate: false)
case .userCancelled:
throw IAPError.paymentCancelled
case .pending:
Expand Down
6 changes: 3 additions & 3 deletions Sources/Flare/Classes/Models/DiscountType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ extension DiscountType {
static func from(productDiscount: SKProductDiscount) -> Self? {
switch productDiscount.type {
case .introductory:
return .introductory
.introductory
case .subscription:
return .promotional
.promotional
@unknown default:
return nil
nil
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/ExpirationReason.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public enum ExpirationReason {
case unknown
}

@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
extension ExpirationReason {
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
init(expirationReason: Product.SubscriptionInfo.RenewalInfo.ExpirationReason) {
switch expirationReason {
case .autoRenewDisabled:
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/IAPError.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import StoreKit
Expand Down
8 changes: 4 additions & 4 deletions Sources/Flare/Classes/Models/PaymentMode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ extension PaymentMode {
static func from(productDiscount: SKProductDiscount) -> Self? {
switch productDiscount.paymentMode {
case .payAsYouGo:
return .payAsYouGo
.payAsYouGo
case .payUpFront:
return .payUpFront
.payUpFront
case .freeTrial:
return .freeTrial
.freeTrial
@unknown default:
return nil
nil
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/PriceIncreaseStatus.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public enum PriceIncreaseStatus {
case agreed
}

@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
extension PriceIncreaseStatus {
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
init(_ status: Product.SubscriptionInfo.RenewalInfo.PriceIncreaseStatus) {
switch status {
case .noIncreasePending:
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/RefundError.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/RefundRequestStatus.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Flare
// Copyright © 2023 Space Code. All rights reserved.
// Copyright © 2024 Space Code. All rights reserved.
//

import Foundation
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/RenewalInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public struct RenewalInfo {

// MARK: - Initialization

@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
extension RenewalInfo {
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
init(renewalInfo: Product.SubscriptionInfo.RenewalInfo) {
self.init(underlyingRenewalInfo: SK2RenewalInfo(underlyingRenewalInfo: renewalInfo))
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Flare/Classes/Models/SubscriptionInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public struct SubscriptionInfo {

// MARK: - Initializators

@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
extension SubscriptionInfo {
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
init(subscriptionInfo: Product.SubscriptionInfo) {
self.init(underlyingSubscriptionInfo: SK2SubscriptionInfo(underlyingInfo: subscriptionInfo))
}
Expand Down
Loading
Loading