diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index ffc50fda..f8e1a7a3 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -20,11 +20,11 @@ jobs: steps: - name: Checkout source uses: actions/checkout@v6 - - name: Download swiftlint binary + - name: Resolve package dependencies run: swift package resolve - name: Lint run: > - "$(find ".build/artifacts/swiftlint" -path "*macos*" -type f -name swiftlint -perm +111 -print -quit)" + swift package plugin --allow-writing-to-package-directory swiftlint -- lint --strict --reporter github-actions-logging - name: Resolve package dependencies run: xcodebuild -resolvePackageDependencies diff --git a/Package.resolved b/Package.resolved index 3c9078a4..24c14c3e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,24 +1,6 @@ { - "originHash" : "482120020e0c33c80672ad054160f25e8d048b7c522a512981c661db6c277c8c", + "originHash" : "e4ddefc032ee230495f1d14c0e8ceddbba8da8cb5d5e0b91491112b534bd8679", "pins" : [ - { - "identity" : "collectionconcurrencykit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git", - "state" : { - "revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95", - "version" : "0.2.0" - } - }, - { - "identity" : "cryptoswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", - "state" : { - "revision" : "e45a26384239e028ec87fbcc788f513b67e10d8f", - "version" : "1.9.0" - } - }, { "identity" : "cwlcatchexception", "kind" : "remoteSourceControl", @@ -46,24 +28,6 @@ "version" : "14.0.0" } }, - { - "identity" : "sourcekitten", - "kind" : "remoteSourceControl", - "location" : "https://github.com/jpsim/SourceKitten.git", - "state" : { - "revision" : "453f75b8a3bb2c3596c0d2dd422c289788233a22", - "version" : "0.37.1" - } - }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser.git", - "state" : { - "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615", - "version" : "1.7.0" - } - }, { "identity" : "swift-custom-dump", "kind" : "remoteSourceControl", @@ -87,37 +51,19 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "1103c45ece4f7fe160b8f75b4ea1ee2e5fac1841", - "version" : "601.0.0" + "revision" : "4799286537280063c85a32f09884cfbca301b1a1", + "version" : "602.0.0" } }, { - "identity" : "swiftlint", + "identity" : "swiftlintplugins", "kind" : "remoteSourceControl", - "location" : "https://github.com/realm/SwiftLint.git", + "location" : "https://github.com/SimplyDanny/SwiftLintPlugins.git", "state" : { - "revision" : "625792423014cc49b0a1e5a1a5c0d6b8b3de10f9", + "revision" : "8545ddf4de043e6f2051c5cf204f39ef778ebf6b", "version" : "0.59.1" } }, - { - "identity" : "swiftytexttable", - "kind" : "remoteSourceControl", - "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git", - "state" : { - "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3", - "version" : "0.9.0" - } - }, - { - "identity" : "swxmlhash", - "kind" : "remoteSourceControl", - "location" : "https://github.com/drmohundro/SWXMLHash.git", - "state" : { - "revision" : "a853604c9e9a83ad9954c7e3d2a565273982471f", - "version" : "7.0.2" - } - }, { "identity" : "xctest-dynamic-overlay", "kind" : "remoteSourceControl", @@ -126,15 +72,6 @@ "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad", "version" : "1.9.0" } - }, - { - "identity" : "yams", - "kind" : "remoteSourceControl", - "location" : "https://github.com/jpsim/Yams.git", - "state" : { - "revision" : "3d6871d5b4a5cd519adf233fbb576e0a2af71c17", - "version" : "5.4.0" - } } ], "version" : 3 diff --git a/Package.swift b/Package.swift index 509ea380..fb519b74 100644 --- a/Package.swift +++ b/Package.swift @@ -24,7 +24,7 @@ let package = Package( ], dependencies: [ .package( - url: "https://github.com/realm/SwiftLint.git", + url: "https://github.com/SimplyDanny/SwiftLintPlugins.git", exact: "0.59.1"), .package( url: "https://github.com/Quick/Nimble.git", @@ -62,6 +62,7 @@ package.targets.forEach { target in .regular, .test, .executable, + .macro, ] guard types.contains(target.type) @@ -78,7 +79,7 @@ package.targets.forEach { target in if enableSwiftLintBuildToolPlugin { target.plugins = (target.plugins ?? []) + [ - .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLint"), + .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins"), ] } }