Skip to content

ci: update simulator version in CI #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ns-vasilev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci: update simulator version in CI #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/flare-ui.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ jobs:
matrix:
include:
# macOS
- { platform: macOS, name: "macOS 26, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.0", runsOn: macOS-26, destination: "platform=macOS", testPlan: "FlareUIUnitTests" }
- { 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" }

# iOS
- { platform: iOS, name: "iOS 26.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0.1,name=iPhone 17 Pro", testPlan: "FlareUIUnitTests" }
- { 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.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "FlareUIUnitTests" }
- { 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.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple Watch Ultra 3 (49mm)", testPlan: "FlareUIUnitTests" }
- { 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" }
steps:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26 }
- { 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 }
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/flare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ jobs:
matrix:
include:
# macOS
- { platform: macOS, name: "macOS 26, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "platform=macOS", testPlan: "UnitTests" }
- { 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" }

# iOS
- { platform: iOS, name: "iOS 26.0, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0.1,name=iPhone 17 Pro", testPlan: "AllTests" }
- { platform: iOS, name: "iOS 26.5, Xcode 26.5, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,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
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "AllTests" }
- { platform: tvOS, name: "tvOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,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.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple Watch Ultra 3 (49mm)", testPlan: "UnitTests" }
- { 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" }
steps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
fail-fast: false
matrix:
include:
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26 }
- { 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 }
Expand Down
14 changes: 6 additions & 8 deletions Sources/FlareUI/Classes/Presentation/Components/Views/ImageView/ImageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ struct ImageView: View {
// MARK: View

var body: some View {
Group {
if #available(macOS 11.0, iOS 14.0, tvOS 14.0, *) {
Image(systemName: systemName)
.resizable()
} else {
defaultImage
.resizable()
}
if #available(macOS 11.0, iOS 14.0, tvOS 14.0, *) {
Image(systemName: systemName)
.resizable()
} else {
defaultImage
.resizable()
}
}
}
19 changes: 9 additions & 10 deletions ...lareUI/Classes/Presentation/Views/ProductView/Views/ProductInfoView/ProductInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,16 @@ struct ProductInfoView: View {
}
}

@ViewBuilder
private func stackView(spacing: CGFloat? = nil, @ViewBuilder content: () -> some View) -> some View {
Group {
switch style {
case .compact:
HStack(alignment: .center, spacing: spacing) {
content()
}
case .large:
VStack(alignment: .center, spacing: spacing) {
content()
}
switch style {
case .compact:
HStack(alignment: .center, spacing: spacing) {
content()
}
case .large:
VStack(alignment: .center, spacing: spacing) {
content()
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions ...s/FlareUI/Classes/Presentation/Views/SubscriptionsView/Views/SubscriptionHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ struct SubscriptionHeaderView: View {
}
}

@ViewBuilder
@MainActor
private var policiesButton: some View {
Group {
if storeButton.contains(.policies) {
storeButtonsAssembly?.assemble(storeButtonType: .policies)
}
if storeButton.contains(.policies) {
storeButtonsAssembly?.assemble(storeButtonType: .policies)
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions .../FlareUI/Classes/Presentation/Views/SubscriptionsView/Views/SubscriptionToolbarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,13 @@ struct SubscriptionToolbarView: View {
.padding(.top)
}

@ViewBuilder
private var storeButtonView: some View {
Group {
if #available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *) {
if storeButton.contains(.restore) {
storeButtonsAssembly?.assemble(storeButtonType: .restore)
.storeButtonViewFontWeight(.bold)
.foregroundColor(subscriptionViewTint)
}
if #available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *) {
if storeButton.contains(.restore) {
storeButtonsAssembly?.assemble(storeButtonType: .restore)
.storeButtonViewFontWeight(.bold)
.foregroundColor(subscriptionViewTint)
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion Tests/FlareTests/UnitTests/Providers/ReceiptRefreshProviderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ class ReceiptRefreshProviderTests: XCTestCase {
}

// then
if case .failure = result { XCTFail("The result must be `success`") }
if case .failure = result {
XCTFail("The result must be `success`")
}
XCTAssertEqual(stubbedRequest.invokedIdGetterCount, 1)
}

Expand Down
2 changes: 1 addition & 1 deletion mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
git-cliff = "2.13.1"
swiftlint = "0.65.0"
swiftformat = "0.62.0"
xcodegen = "2.45.4"
xcodegen = "2.43.0"

[settings]
experimental = true
Expand Down
4 changes: 4 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
{
"matchManagers": ["github-actions"],
"labels": ["github-actions", "ci"]
},
{
"matchPackageNames": ["xcodegen"],
"enabled": false
}
],
"lockFileMaintenance": {
Expand Down
Loading