Skip to content

Commit b25072c

Browse files
ns-vasilevns-vasilev
committed
ci: update simulator version in CI
1 parent 2e0d18c commit b25072c

7 files changed

Lines changed: 36 additions & 39 deletions

File tree

‎.github/workflows/flare-ui.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ jobs:
4343
- { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS", testPlan: "FlareUIUnitTests" }
4444

4545
# iOS
46-
- { 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" }
46+
- { platform: iOS, name: "iOS 26.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=iPhone 17 Pro", testPlan: "FlareUIUnitTests" }
4747
- { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro", testPlan: "FlareUIUnitTests" }
4848
- { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro", testPlan: "FlareUIUnitTests" }
4949

5050
# tvOS
51-
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "FlareUIUnitTests" }
51+
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "FlareUIUnitTests" }
5252
- { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV", testPlan: "FlareUIUnitTests" }
5353
- { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV", testPlan: "FlareUIUnitTests" }
5454

5555
# watchOS
56-
- { 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" }
56+
- { platform: watchOS, name: "watchOS 26.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.0,name=Apple Watch Ultra 3 (49mm)", testPlan: "FlareUIUnitTests" }
5757
- { 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" }
5858
- { 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" }
5959
steps:
@@ -87,7 +87,7 @@ jobs:
8787
fail-fast: false
8888
matrix:
8989
include:
90-
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26 }
90+
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26 }
9191
- { name: "macOS 14, SPM 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14 }
9292
- { name: "macOS 14, SPM 5.10.0", xcode: "Xcode_15.3", runsOn: macOS-14 }
9393
steps:

‎.github/workflows/flare.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@ jobs:
3737
matrix:
3838
include:
3939
# macOS
40-
- { 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" }
40+
- { platform: macOS, name: "macOS 26, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "platform=macOS", testPlan: "UnitTests" }
4141
- { platform: macOS, name: "macOS 14, Xcode 16.1, Swift 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "platform=macOS", testPlan: "UnitTests" }
4242
- { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS", testPlan: "UnitTests" }
4343

4444
# iOS
45-
- { 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" }
45+
- { platform: iOS, name: "iOS 26.0, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=iPhone 17 Pro", testPlan: "AllTests" }
4646
- { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro", testPlan: "AllTests" }
4747
- { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro", testPlan: "AllTests" }
4848

4949
# tvOS
50-
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.0.1", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "AllTests" }
50+
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.0,name=Apple TV", testPlan: "AllTests" }
5151
- { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV", testPlan: "AllTests" }
5252
- { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV", testPlan: "AllTests" }
5353

5454
# watchOS
55-
- { 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" }
55+
- { platform: watchOS, name: "watchOS 26.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.0,name=Apple Watch Ultra 3 (49mm)", testPlan: "UnitTests" }
5656
- { 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" }
5757
- { 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" }
5858
steps:
@@ -86,7 +86,7 @@ jobs:
8686
fail-fast: false
8787
matrix:
8888
include:
89-
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.0.1", runsOn: macOS-26 }
89+
- { name: "macOS 26, SPM 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26 }
9090
- { name: "macOS 15, SPM 6.0.2", xcode: "Xcode_16.0", runsOn: macOS-15 }
9191
- { name: "macOS 14, SPM 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14 }
9292
- { name: "macOS 14, SPM 5.10.0", xcode: "Xcode_15.3", runsOn: macOS-14 }

‎Sources/FlareUI/Classes/Presentation/Components/Views/ImageView/ImageView.swift‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ struct ImageView: View {
2121
// MARK: View
2222

2323
var body: some View {
24-
Group {
25-
if #available(macOS 11.0, iOS 14.0, tvOS 14.0, *) {
26-
Image(systemName: systemName)
27-
.resizable()
28-
} else {
29-
defaultImage
30-
.resizable()
31-
}
24+
if #available(macOS 11.0, iOS 14.0, tvOS 14.0, *) {
25+
Image(systemName: systemName)
26+
.resizable()
27+
} else {
28+
defaultImage
29+
.resizable()
3230
}
3331
}
3432
}

‎Sources/FlareUI/Classes/Presentation/Views/ProductView/Views/ProductInfoView/ProductInfoView.swift‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,16 @@ struct ProductInfoView: View {
130130
}
131131
}
132132

133+
@ViewBuilder
133134
private func stackView(spacing: CGFloat? = nil, @ViewBuilder content: () -> some View) -> some View {
134-
Group {
135-
switch style {
136-
case .compact:
137-
HStack(alignment: .center, spacing: spacing) {
138-
content()
139-
}
140-
case .large:
141-
VStack(alignment: .center, spacing: spacing) {
142-
content()
143-
}
135+
switch style {
136+
case .compact:
137+
HStack(alignment: .center, spacing: spacing) {
138+
content()
139+
}
140+
case .large:
141+
VStack(alignment: .center, spacing: spacing) {
142+
content()
144143
}
145144
}
146145
}

‎Sources/FlareUI/Classes/Presentation/Views/SubscriptionsView/Views/SubscriptionHeaderView.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ struct SubscriptionHeaderView: View {
5353
}
5454
}
5555

56+
@ViewBuilder
5657
@MainActor
5758
private var policiesButton: some View {
58-
Group {
59-
if storeButton.contains(.policies) {
60-
storeButtonsAssembly?.assemble(storeButtonType: .policies)
61-
}
59+
if storeButton.contains(.policies) {
60+
storeButtonsAssembly?.assemble(storeButtonType: .policies)
6261
}
6362
}
6463
}

‎Sources/FlareUI/Classes/Presentation/Views/SubscriptionsView/Views/SubscriptionToolbarView.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,13 @@ struct SubscriptionToolbarView: View {
7474
.padding(.top)
7575
}
7676

77+
@ViewBuilder
7778
private var storeButtonView: some View {
78-
Group {
79-
if #available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *) {
80-
if storeButton.contains(.restore) {
81-
storeButtonsAssembly?.assemble(storeButtonType: .restore)
82-
.storeButtonViewFontWeight(.bold)
83-
.foregroundColor(subscriptionViewTint)
84-
}
79+
if #available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *) {
80+
if storeButton.contains(.restore) {
81+
storeButtonsAssembly?.assemble(storeButtonType: .restore)
82+
.storeButtonViewFontWeight(.bold)
83+
.foregroundColor(subscriptionViewTint)
8584
}
8685
}
8786
}

‎Tests/FlareTests/UnitTests/Providers/ReceiptRefreshProviderTests.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ class ReceiptRefreshProviderTests: XCTestCase {
9292
}
9393

9494
// then
95-
if case .failure = result { XCTFail("The result must be `success`") }
95+
if case .failure = result {
96+
XCTFail("The result must be `success`")
97+
}
9698
XCTAssertEqual(stubbedRequest.invokedIdGetterCount, 1)
9799
}
98100

0 commit comments

Comments
 (0)