diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f57f60..3becd794 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,22 +40,22 @@ jobs: matrix: include: # macOS - - { platform: macOS, name: "macOS 26, Xcode 26.0, Swift 6.2.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "platform=macOS" } + - { platform: macOS, name: "macOS 26, Xcode 26.5, Swift 6.2.0", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "platform=macOS" } - { platform: macOS, name: "macOS 14, Xcode 16.1, Swift 6.0.2", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "platform=macOS" } - { platform: macOS, name: "macOS 14, Xcode 15.4, Swift 5.10", xcode: "Xcode_15.4", runsOn: macOS-14, destination: "platform=macOS" } # iOS - - { platform: iOS, name: "iOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=iPhone 17 Pro" } + - { platform: iOS, name: "iOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=iPhone 17 Pro" } - { platform: iOS, name: "iOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=iPhone 16 Pro" } - { platform: iOS, name: "iOS 17.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=17.4,name=iPhone 15 Pro" } # tvOS - - { platform: tvOS, name: "tvOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=Apple TV" } + - { platform: tvOS, name: "tvOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple TV" } - { platform: tvOS, name: "tvOS 18.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=18.1,name=Apple TV" } - { platform: tvOS, name: "tvOS 17.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=17.4,name=Apple TV" } # watchOS - - { platform: watchOS, name: "watchOS 26.0", xcode: "Xcode_26.1.1", runsOn: macOS-26, destination: "OS=26.1,name=Apple Watch Ultra 3 (49mm)" } + - { platform: watchOS, name: "watchOS 26.5", xcode: "Xcode_26.5", runsOn: macOS-26, destination: "OS=26.5,name=Apple Watch Ultra 3 (49mm)" } - { platform: watchOS, name: "watchOS 11.1", xcode: "Xcode_16.1", runsOn: macOS-14, destination: "OS=11.1,name=Apple Watch Series 10 (46mm)" } - { platform: watchOS, name: "watchOS 10.5", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.5,name=Apple Watch Series 9 (45mm)" } - { platform: watchOS, name: "watchOS 10.4", xcode: "Xcode_15.3", runsOn: macOS-14, destination: "OS=10.4,name=Apple Watch Series 9 (45mm)" } diff --git a/Sources/ValidatorCore/Classes/Rules/IPAddressValidationRule.swift b/Sources/ValidatorCore/Classes/Rules/IPAddressValidationRule.swift index ae7b8e62..879576de 100644 --- a/Sources/ValidatorCore/Classes/Rules/IPAddressValidationRule.swift +++ b/Sources/ValidatorCore/Classes/Rules/IPAddressValidationRule.swift @@ -55,7 +55,9 @@ public struct IPAddressValidationRule: IValidationRule { // MARK: IValidationRule public func validate(input: String) -> Bool { - if input.isEmpty { return false } + if input.isEmpty { + return false + } if input.contains(" ") || input.contains("\t") || input.contains("\n") { return false diff --git a/Sources/ValidatorUI/Classes/SUI/Managers/FormField/FormFieldManager/FormFieldManager.swift b/Sources/ValidatorUI/Classes/SUI/Managers/FormField/FormFieldManager/FormFieldManager.swift index c276722a..24b26ce0 100644 --- a/Sources/ValidatorUI/Classes/SUI/Managers/FormField/FormFieldManager/FormFieldManager.swift +++ b/Sources/ValidatorUI/Classes/SUI/Managers/FormField/FormFieldManager/FormFieldManager.swift @@ -54,9 +54,7 @@ public final class FormFieldManager: IFormFieldManager { /// Recalculates the overall form validity by checking all registered validators. public func validate() { - // swiftlint:disable:next contains_over_filter_is_empty - isValid = validators - .filter { $0.validate() != .valid } - .isEmpty + isValid = !validators + .contains(where: { $0.validate() != .valid }) } } diff --git a/Tests/ValidatorUITests/UnitTests/AppKit/NSTextFieldTests.swift b/Tests/ValidatorUITests/UnitTests/AppKit/NSTextFieldTests.swift index fa46faff..4828b086 100644 --- a/Tests/ValidatorUITests/UnitTests/AppKit/NSTextFieldTests.swift +++ b/Tests/ValidatorUITests/UnitTests/AppKit/NSTextFieldTests.swift @@ -33,7 +33,9 @@ import XCTest // when if case .valid = result {} - else { XCTFail("The result must be equal to the valid value") } + else { + XCTFail("The result must be equal to the valid value") + } } @MainActor @@ -56,7 +58,9 @@ import XCTest if case let .invalid(errors) = result { XCTAssertEqual(errors.count, 1) XCTAssertEqual(errors.first?.message, .error) - } else { XCTFail("The result must be equal to the invalid value") } + } else { + XCTFail("The result must be equal to the invalid value") + } } } diff --git a/Tests/ValidatorUITests/UnitTests/UIKit/UITextFieldTests.swift b/Tests/ValidatorUITests/UnitTests/UIKit/UITextFieldTests.swift index 8284dfb7..75df4c8c 100644 --- a/Tests/ValidatorUITests/UnitTests/UIKit/UITextFieldTests.swift +++ b/Tests/ValidatorUITests/UnitTests/UIKit/UITextFieldTests.swift @@ -33,7 +33,9 @@ import XCTest // when if case .valid = result {} - else { XCTFail("The result must be equal to the valid value") } + else { + XCTFail("The result must be equal to the valid value") + } } @MainActor @@ -56,7 +58,9 @@ import XCTest if case let .invalid(errors) = result { XCTAssertEqual(errors.count, 1) XCTAssertEqual(errors.first?.message, .error) - } else { XCTFail("The result must be equal to the invalid value") } + } else { + XCTFail("The result must be equal to the invalid value") + } } } #endif diff --git a/Tests/ValidatorUITests/UnitTests/UIKit/UITextViewTests.swift b/Tests/ValidatorUITests/UnitTests/UIKit/UITextViewTests.swift index 76212d8f..d017e8ed 100644 --- a/Tests/ValidatorUITests/UnitTests/UIKit/UITextViewTests.swift +++ b/Tests/ValidatorUITests/UnitTests/UIKit/UITextViewTests.swift @@ -33,7 +33,9 @@ import XCTest // when if case .valid = result {} - else { XCTFail("The result must be equal to the valid value") } + else { + XCTFail("The result must be equal to the valid value") + } } @MainActor @@ -56,7 +58,9 @@ import XCTest if case let .invalid(errors) = result { XCTAssertEqual(errors.count, 1) XCTAssertEqual(errors.first?.message, .error) - } else { XCTFail("The result must be equal to the invalid value") } + } else { + XCTFail("The result must be equal to the invalid value") + } } } #endif