From 19d12beaef5d328205178d1cb8bd92baf1fa2321 Mon Sep 17 00:00:00 2001 From: kmcbride Date: Fri, 16 Feb 2024 14:21:41 -0800 Subject: [PATCH] Bump swiftlint --- .github/workflows/ci.yaml | 2 +- .swiftlint.yml | 8 +++----- MobiusCore/Test/AnonymousDisposableTests.swift | 2 +- MobiusCore/Test/ConnectablePublisherTests.swift | 2 +- .../Test/EffectHandlers/AnyEffectHandlerTests.swift | 2 +- MobiusCore/Test/EffectHandlers/CallbackTests.swift | 2 +- MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift | 4 +--- MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift | 4 +--- MobiusCore/Test/EffectHandlers/EffectRouterTests.swift | 4 +--- MobiusCore/Test/EffectHandlers/EnumRouteTests.swift | 3 --- .../EventSources/CompositeEventSourceBuilderTests.swift | 2 +- MobiusCore/Test/MobiusControllerTests.swift | 6 +++--- MobiusCore/Test/MobiusIntegrationTests.swift | 2 +- MobiusCore/Test/MobiusLoopTests.swift | 2 +- MobiusCore/Test/NonReentrancyTests.swift | 2 +- MobiusCore/Test/WorkBagTests.swift | 2 +- MobiusExtras/Test/ConnectableClassTests.swift | 2 +- MobiusExtras/Test/WikiTutorialTest.swift | 4 ++-- MobiusNimble/Test/NimbleFirstMatchersTests.swift | 3 ++- MobiusNimble/Test/NimbleNextMatchersTests.swift | 4 ++-- MobiusTest/Test/DebugDiffTests.swift | 4 ++-- MobiusTest/Test/FirstMatchersTests.swift | 2 +- MobiusTest/Test/NextMatchersTests.swift | 4 ++-- MobiusTest/Test/UpdateSpecTests.swift | 2 +- 24 files changed, 32 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2bd47ffa..93d0439c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,6 +23,6 @@ jobs: steps: - uses: actions/checkout@v2 - name: GitHub Action for SwiftLint - uses: norio-nomura/action-swiftlint@3.0.1 + uses: norio-nomura/action-swiftlint@3.2.1 with: args: lint --no-cache --strict diff --git a/.swiftlint.yml b/.swiftlint.yml index 1d83e5c8..e04bc34e 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -5,11 +5,9 @@ disabled_rules: - superfluous_disable_command # Disabled since we disable some rules pre-emptively to avoid issues in the future - todo # Disabled while we are filling out the framework; re-enable when we get closer to completion - nesting # Does not make sense anymore since Swift 4 uses nested `CodingKeys` enums for example - - implicit_return # Suddenly started firing for existing code on PRs, should investigate later opt_in_rules: - - anyobject_protocol - attributes - closure_end_indentation - closure_spacing @@ -29,7 +27,6 @@ opt_in_rules: - first_where - identical_operands - implicit_return - - inert_defer - joined_default_parameter - literal_expression_end_indentation - legacy_hashing @@ -55,6 +52,7 @@ opt_in_rules: - trailing_whitespace - unneeded_parentheses_in_closure_argument - vertical_parameter_alignment_on_call + - weak_delegate - yoda_condition excluded: @@ -71,8 +69,8 @@ attributes: - "@NSManaged" - "@objc" closure_spacing: warning -empty_count: warning -explicit_init: warning +empty_count: + severity: warning fatal_error_message: warning file_header: severity: warning diff --git a/MobiusCore/Test/AnonymousDisposableTests.swift b/MobiusCore/Test/AnonymousDisposableTests.swift index faea93fe..1d9b319a 100644 --- a/MobiusCore/Test/AnonymousDisposableTests.swift +++ b/MobiusCore/Test/AnonymousDisposableTests.swift @@ -17,7 +17,7 @@ import Nimble import Quick class AnonymousDisposableTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("AnonymousDisposable") { var disposable: AnonymousDisposable! diff --git a/MobiusCore/Test/ConnectablePublisherTests.swift b/MobiusCore/Test/ConnectablePublisherTests.swift index aa9efcf0..48be9cb0 100644 --- a/MobiusCore/Test/ConnectablePublisherTests.swift +++ b/MobiusCore/Test/ConnectablePublisherTests.swift @@ -18,7 +18,7 @@ import Nimble import Quick class ConnectablePublisherTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("ConnectablePublisher") { var publisher: ConnectablePublisher! diff --git a/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift b/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift index 2e1017d0..1a974df8 100644 --- a/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift +++ b/MobiusCore/Test/EffectHandlers/AnyEffectHandlerTests.swift @@ -20,7 +20,7 @@ private typealias Effect = String private typealias Event = String class AnyEffectHandlerTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("AnyEffectHandler") { var effectHandler: AnyEffectHandler! diff --git a/MobiusCore/Test/EffectHandlers/CallbackTests.swift b/MobiusCore/Test/EffectHandlers/CallbackTests.swift index 547a7e30..d548317f 100644 --- a/MobiusCore/Test/EffectHandlers/CallbackTests.swift +++ b/MobiusCore/Test/EffectHandlers/CallbackTests.swift @@ -17,7 +17,7 @@ import Nimble import Quick class CallbackTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("Callbacks") { context("Ending a Callback") { diff --git a/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift b/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift index e8ebcec0..a76ab783 100644 --- a/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift +++ b/MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift @@ -27,10 +27,7 @@ private enum Event { case eventForEffect1 } -// swiftlint:disable type_body_length file_length - class EffectHandlerTests: QuickSpec { - // swiftlint:disable function_body_length override func spec() { describe("Handling effects with EffectHandler") { var effectHandler: AnyEffectHandler! @@ -63,6 +60,7 @@ class EffectHandlerTests: QuickSpec { } } } + describe("Disposing EffectHandler") { it("calls the returned disposable when disposing") { var disposed = false diff --git a/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift b/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift index d91dd42f..32ab2891 100644 --- a/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift +++ b/MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift @@ -16,8 +16,6 @@ import MobiusCore import Nimble import Quick -// swiftlint:disable type_body_length file_length - private enum Effect: Equatable { case effect1 case effect2 @@ -29,7 +27,7 @@ private enum Event: Equatable { } class EffectRouterDSLTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { context("An EffectHandler which always ends as soon as it is called") { var wasDisposed: Bool! diff --git a/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift b/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift index a2aa1a4a..4616069e 100644 --- a/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift +++ b/MobiusCore/Test/EffectHandlers/EffectRouterTests.swift @@ -17,8 +17,6 @@ import MobiusCore import Nimble import Quick -// swiftlint:disable type_body_length file_length - private enum Effect { case effect1 case effect2 @@ -32,7 +30,7 @@ private enum Event { } class EffectRouterTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { context("Router happy paths") { var receivedEvents: [Event]! diff --git a/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift b/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift index 61be83b7..3d03eb1d 100644 --- a/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift +++ b/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift @@ -16,8 +16,6 @@ import MobiusCore import Nimble import Quick -// swiftlint:disable type_body_length file_length - private typealias Event = () private enum Effect { @@ -48,7 +46,6 @@ private func unwrap( } class ParameterExtractionRouteTests: QuickSpec { - // swiftlint:disable function_body_length override func spec() { context("Different types of enums being unwrapped") { it("supports routing to an effect with nothing to unwrap") { diff --git a/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift b/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift index c2cf2978..450b91cb 100644 --- a/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift +++ b/MobiusCore/Test/EventSources/CompositeEventSourceBuilderTests.swift @@ -17,7 +17,7 @@ import Nimble import Quick class CompositeEventSourceBuilderTest: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { var eventsReceived: [Int]! var compositeEventSource: AnyEventSource! diff --git a/MobiusCore/Test/MobiusControllerTests.swift b/MobiusCore/Test/MobiusControllerTests.swift index 19183b1c..3b74afd0 100644 --- a/MobiusCore/Test/MobiusControllerTests.swift +++ b/MobiusCore/Test/MobiusControllerTests.swift @@ -18,13 +18,13 @@ import Foundation import Nimble import Quick -// swiftlint:disable type_body_length file_length - +// swiftlint:disable file_length +// swiftlint:disable:next type_body_length class MobiusControllerTests: QuickSpec { let loopQueue = DispatchQueue(label: "loop queue") let viewQueue = DispatchQueue(label: "view queue") - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("MobiusController") { var controller: MobiusController! diff --git a/MobiusCore/Test/MobiusIntegrationTests.swift b/MobiusCore/Test/MobiusIntegrationTests.swift index 1cd8e4e3..aea4a63d 100644 --- a/MobiusCore/Test/MobiusIntegrationTests.swift +++ b/MobiusCore/Test/MobiusIntegrationTests.swift @@ -19,7 +19,7 @@ import Quick // Should only test public APIs class MobiusIntegrationTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("Mobius integration tests") { let update = Update { _, event in diff --git a/MobiusCore/Test/MobiusLoopTests.swift b/MobiusCore/Test/MobiusLoopTests.swift index ec9dc20e..73f0e049 100644 --- a/MobiusCore/Test/MobiusLoopTests.swift +++ b/MobiusCore/Test/MobiusLoopTests.swift @@ -18,7 +18,7 @@ import Nimble import Quick class MobiusLoopTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("MobiusLoop") { var builder: Mobius.Builder! diff --git a/MobiusCore/Test/NonReentrancyTests.swift b/MobiusCore/Test/NonReentrancyTests.swift index 244c30b3..4c090c8b 100644 --- a/MobiusCore/Test/NonReentrancyTests.swift +++ b/MobiusCore/Test/NonReentrancyTests.swift @@ -37,7 +37,7 @@ private enum Effect: String, CustomStringConvertible, Equatable { } class NonReentrancyTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("MobiusLoop") { var loop: MobiusLoop! diff --git a/MobiusCore/Test/WorkBagTests.swift b/MobiusCore/Test/WorkBagTests.swift index f53a8c0a..2dd510c5 100644 --- a/MobiusCore/Test/WorkBagTests.swift +++ b/MobiusCore/Test/WorkBagTests.swift @@ -17,7 +17,7 @@ import Nimble import Quick class WorkBagTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("WorkBag") { var workBag: WorkBag! diff --git a/MobiusExtras/Test/ConnectableClassTests.swift b/MobiusExtras/Test/ConnectableClassTests.swift index e571de0f..19737685 100644 --- a/MobiusExtras/Test/ConnectableClassTests.swift +++ b/MobiusExtras/Test/ConnectableClassTests.swift @@ -20,7 +20,7 @@ import Quick @testable import MobiusExtras class ConnectableTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("ConnectableClass") { beforeEach { diff --git a/MobiusExtras/Test/WikiTutorialTest.swift b/MobiusExtras/Test/WikiTutorialTest.swift index dd609df1..83b32e7e 100644 --- a/MobiusExtras/Test/WikiTutorialTest.swift +++ b/MobiusExtras/Test/WikiTutorialTest.swift @@ -18,8 +18,7 @@ import XCTest /// Test cases that reproduce the Getting Started section of the GitHub wiki class WikiTutorialTest: XCTestCase { - // swiftlint:disable function_body_length - + // swiftlint:disable:next function_body_length func testWikiCreatingALoop() { // Standin implementation of print() var printedValues: [String] = [] @@ -62,6 +61,7 @@ class WikiTutorialTest: XCTestCase { XCTAssertEqual(printedValues, ["2", "1", "0", "0", "1", "2", "1"]) } + // swiftlint:disable:next function_body_length func testWikiCreatingALoop_addingEffects() { // Standin implementation of print() var printedValues: [String] = [] diff --git a/MobiusNimble/Test/NimbleFirstMatchersTests.swift b/MobiusNimble/Test/NimbleFirstMatchersTests.swift index 70f57b43..d70f5e60 100644 --- a/MobiusNimble/Test/NimbleFirstMatchersTests.swift +++ b/MobiusNimble/Test/NimbleFirstMatchersTests.swift @@ -19,8 +19,9 @@ import Nimble import Quick import XCTest +// swiftlint:disable:next type_body_length class NimbleFirstMatchersTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { let assertionHandler = AssertionRecorder() var defaultHandler: AssertionHandler? diff --git a/MobiusNimble/Test/NimbleNextMatchersTests.swift b/MobiusNimble/Test/NimbleNextMatchersTests.swift index 01cf99b6..4c8c22fe 100644 --- a/MobiusNimble/Test/NimbleNextMatchersTests.swift +++ b/MobiusNimble/Test/NimbleNextMatchersTests.swift @@ -23,9 +23,9 @@ import XCTest // is replaced in order to be inspected // swiftlint:disable file_length -// swiftlint:disable type_body_length +// swiftlint:disable:next type_body_length class NimbleNextMatchersTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { let assertionHandler = AssertionRecorder() var defaultHandler: AssertionHandler? diff --git a/MobiusTest/Test/DebugDiffTests.swift b/MobiusTest/Test/DebugDiffTests.swift index 2c3d0568..5d09f06d 100644 --- a/MobiusTest/Test/DebugDiffTests.swift +++ b/MobiusTest/Test/DebugDiffTests.swift @@ -26,9 +26,9 @@ enum TestEnum: Equatable { case first, second(String), third(Int) } -// swiftlint:disable type_body_length +// swiftlint:disable:next type_body_length class DebugDiffTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("DumpDiff") { var diff: String? diff --git a/MobiusTest/Test/FirstMatchersTests.swift b/MobiusTest/Test/FirstMatchersTests.swift index 5a81f548..1a6c4454 100644 --- a/MobiusTest/Test/FirstMatchersTests.swift +++ b/MobiusTest/Test/FirstMatchersTests.swift @@ -18,7 +18,7 @@ import Nimble import Quick class FirstMatchersTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("assertThatFirst") { var failureMessages: [String] = [] diff --git a/MobiusTest/Test/NextMatchersTests.swift b/MobiusTest/Test/NextMatchersTests.swift index ec12e8ea..2786d28c 100644 --- a/MobiusTest/Test/NextMatchersTests.swift +++ b/MobiusTest/Test/NextMatchersTests.swift @@ -22,9 +22,9 @@ import XCTest // is replaced in order to be inspected // swiftlint:disable file_length -// swiftlint:disable type_body_length +// swiftlint:disable:next type_body_length class XCTestNextMatchersTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { describe("AssertThatNext") { var failMessages: [String] = [] diff --git a/MobiusTest/Test/UpdateSpecTests.swift b/MobiusTest/Test/UpdateSpecTests.swift index 83775302..34e02993 100644 --- a/MobiusTest/Test/UpdateSpecTests.swift +++ b/MobiusTest/Test/UpdateSpecTests.swift @@ -36,7 +36,7 @@ enum MyEffect { } class UpdateSpecTests: QuickSpec { - // swiftlint:disable function_body_length + // swiftlint:disable:next function_body_length override func spec() { let updateSpec = UpdateSpec(myUpdate)