Skip to content

Commit 0bda719

Browse files
committed
ci: update simulator version in CI
1 parent 42e26bc commit 0bda719

6 files changed

Lines changed: 27 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ jobs:
4040
matrix:
4141
include:
4242
# macOS
43-
- { platform: macOS, name: "macOS 26, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "platform=macOS" }
43+
- { platform: macOS, name: "macOS 26, Xcode 26.5, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "platform=macOS" }
4444
- { platform: macOS, name: "macOS 14, Xcode 16.1, Swift 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "platform=macOS" }
4545
- { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS" }
4646

4747
# iOS
48-
- { platform: iOS, name: "iOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=iPhone 17 Pro" }
48+
- { platform: iOS, name: "iOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=iPhone 17 Pro" }
4949
- { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro" }
5050
- { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro" }
5151

5252
# tvOS
53-
- { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=Apple TV" }
53+
- { platform: tvOS, name: "tvOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple TV" }
5454
- { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV" }
5555
- { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV" }
5656

5757
# watchOS
58-
- { platform: watchOS, name: "watchOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=Apple Watch Ultra 3 (49mm)" }
58+
- { platform: watchOS, name: "watchOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple Watch Ultra 3 (49mm)" }
5959
- { platform: watchOS, name: "watchOS 11.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=11.1,name=Apple Watch Series 10 (46mm)" }
6060
- { platform: watchOS, name: "watchOS 10.5", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.5,name=Apple Watch Series 9 (45mm)" }
6161
- { platform: watchOS, name: "watchOS 10.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.4,name=Apple Watch Series 9 (45mm)" }

Sources/ValidatorCore/Classes/Rules/IPAddressValidationRule.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ public struct IPAddressValidationRule: IValidationRule {
5555
// MARK: IValidationRule
5656

5757
public func validate(input: String) -> Bool {
58-
if input.isEmpty { return false }
58+
if input.isEmpty {
59+
return false
60+
}
5961

6062
if input.contains(" ") || input.contains("\t") || input.contains("\n") {
6163
return false

Sources/ValidatorUI/Classes/SUI/Managers/FormField/FormFieldManager/FormFieldManager.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ public final class FormFieldManager: IFormFieldManager {
5454

5555
/// Recalculates the overall form validity by checking all registered validators.
5656
public func validate() {
57-
// swiftlint:disable:next contains_over_filter_is_empty
58-
isValid = validators
59-
.filter { $0.validate() != .valid }
60-
.isEmpty
57+
isValid = !validators
58+
.contains(where: { $0.validate() != .valid })
6159
}
6260
}

Tests/ValidatorUITests/UnitTests/AppKit/NSTextFieldTests.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ import XCTest
3333

3434
// when
3535
if case .valid = result {}
36-
else { XCTFail("The result must be equal to the valid value") }
36+
else {
37+
XCTFail("The result must be equal to the valid value")
38+
}
3739
}
3840

3941
@MainActor
@@ -56,7 +58,9 @@ import XCTest
5658
if case let .invalid(errors) = result {
5759
XCTAssertEqual(errors.count, 1)
5860
XCTAssertEqual(errors.first?.message, .error)
59-
} else { XCTFail("The result must be equal to the invalid value") }
61+
} else {
62+
XCTFail("The result must be equal to the invalid value")
63+
}
6064
}
6165
}
6266

Tests/ValidatorUITests/UnitTests/UIKit/UITextFieldTests.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ import XCTest
3333

3434
// when
3535
if case .valid = result {}
36-
else { XCTFail("The result must be equal to the valid value") }
36+
else {
37+
XCTFail("The result must be equal to the valid value")
38+
}
3739
}
3840

3941
@MainActor
@@ -56,7 +58,9 @@ import XCTest
5658
if case let .invalid(errors) = result {
5759
XCTAssertEqual(errors.count, 1)
5860
XCTAssertEqual(errors.first?.message, .error)
59-
} else { XCTFail("The result must be equal to the invalid value") }
61+
} else {
62+
XCTFail("The result must be equal to the invalid value")
63+
}
6064
}
6165
}
6266
#endif

Tests/ValidatorUITests/UnitTests/UIKit/UITextViewTests.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ import XCTest
3333

3434
// when
3535
if case .valid = result {}
36-
else { XCTFail("The result must be equal to the valid value") }
36+
else {
37+
XCTFail("The result must be equal to the valid value")
38+
}
3739
}
3840

3941
@MainActor
@@ -56,7 +58,9 @@ import XCTest
5658
if case let .invalid(errors) = result {
5759
XCTAssertEqual(errors.count, 1)
5860
XCTAssertEqual(errors.first?.message, .error)
59-
} else { XCTFail("The result must be equal to the invalid value") }
61+
} else {
62+
XCTFail("The result must be equal to the invalid value")
63+
}
6064
}
6165
}
6266
#endif

0 commit comments

Comments
 (0)