From ab453580ade7570026b2a4899c85b9e1849e707c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20M=C3=B6sch?= Date: Tue, 14 Jan 2025 21:49:05 +0100 Subject: [PATCH] Update SwiftLint to version 0.58.x (#669) --- .swiftlint.yml | 4 +--- pass.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 74aa64c..567e86d 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -36,7 +36,6 @@ disabled_rules: - function_body_length - implicitly_unwrapped_optional - indentation_width - - inert_defer # Deprecated. - legacy_objc_type - line_length - missing_docs @@ -58,7 +57,6 @@ disabled_rules: - type_body_length - type_contents_order - unowned_variable_capture - - unused_capture_list # Deprecated. - vertical_whitespace_between_cases # Additional whitespace not needed because of visible indentation. ## Configuration for specific rules @@ -82,5 +80,5 @@ trailing_closure: trailing_comma: mandatory_comma: true xct_specific_matcher: - matchers: + matchers: - two-argument-asserts diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index 4bbf900..5103e12 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -1496,7 +1496,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "SWIFT_PACKAGE_DIR=\"${BUILD_DIR%Build/*}SourcePackages/artifacts\"\nSWIFTLINT_CMD=$(ls \"$SWIFT_PACKAGE_DIR\"/swiftlintplugins/SwiftLintBinary/SwiftLintBinary.artifactbundle/swiftlint-*/bin/swiftlint | head -n 1)\n\nSTRICT_OPT=\n\nif [[ \"${CI}\" == \"true\" ]]; then\n echo \"Running in a Continuous Integration environment. Linting is strictly.\"\n STRICT_OPT=--strict\nfi\n\nif [[ \"${CONFIGURATION}\" == \"Release\" ]]; then\n echo \"Running during a release build. Linting is skipped.\"\n exit 0\nfi\n\nif test -f \"$SWIFTLINT_CMD\" 2>&1\nthen\n \"$SWIFTLINT_CMD\" lint --fix\n \"$SWIFTLINT_CMD\" lint $STRICT_OPT\nelse\n echo \"warning: `swiftlint` command not found\"\nfi\n"; + shellScript = "SWIFT_PACKAGE_DIR=\"${BUILD_DIR%Build/*}SourcePackages/artifacts\"\nSWIFTLINT_CMD=$(ls \"$SWIFT_PACKAGE_DIR\"/swiftlintplugins/SwiftLintBinary/SwiftLintBinary.artifactbundle/swiftlint-*-macos/bin/swiftlint | head -n 1)\n\nSTRICT_OPT=\n\nif [[ \"${CI}\" == \"true\" ]]; then\n echo \"Running in a Continuous Integration environment. Linting is strictly.\"\n STRICT_OPT=--strict\nfi\n\nif [[ \"${CONFIGURATION}\" == \"Release\" ]]; then\n echo \"Running during a release build. Linting is skipped.\"\n exit 0\nfi\n\nif test -f \"$SWIFTLINT_CMD\" 2>&1\nthen\n \"$SWIFTLINT_CMD\" lint --fix\n \"$SWIFTLINT_CMD\" lint $STRICT_OPT\nelse\n echo \"warning: `swiftlint` command not found\"\nfi\n"; }; 9A996C4726DDEAF100A4485D /* Remove SPM Duplicate Frameworks */ = { isa = PBXShellScriptBuildPhase; @@ -2872,7 +2872,7 @@ repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins.git"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 0.57.1; + minimumVersion = 0.58.0; }; }; 307CA2322CF348260099F6DE /* XCRemoteSwiftPackageReference "SwiftFormat" */ = { diff --git a/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 127aac9..907df41 100644 --- a/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/pass.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SimplyDanny/SwiftLintPlugins.git", "state" : { - "revision" : "f9731bef175c3eea3a0ca960f1be78fcc2bc7853", - "version" : "0.57.1" + "revision" : "fac0c3d3ac69b15ea5382275dbbd5e583a2e05fa", + "version" : "0.58.0" } }, {