diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 3c5758c..b6be8ec 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -5,7 +5,7 @@ on: jobs: danger: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 997bb03..94aa4e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,20 +11,10 @@ jobs: strategy: fail-fast: false matrix: - xcode: ["14.2", "14.1", "14.0.1", "13.4.1", "13.3.1", "13.2.1"] + xcode: ["14.3.1"] include: - - xcode: "14.2" - macos: macos-12 - - xcode: "14.1" - macos: macos-12 - - xcode: "14.0.1" - macos: macos-12 - - xcode: "13.4.1" - macos: macos-12 - - xcode: "13.3.1" - macos: macos-12 - - xcode: "13.2.1" - macos: macos-12 + - xcode: "14.3.1" + macos: macos-13 runs-on: ${{ matrix.macos }} name: macOS steps: @@ -67,17 +57,11 @@ jobs: strategy: fail-fast: false matrix: - swift: ["5.7", "5.6", "5.5"] + swift: ["5.8"] include: - - swift: "5.7" - container: "swift:5.7" + - swift: "5.8" + container: "swift:5.8" cache-version: 1 - - swift: "5.6" - container: "swift:5.6" - cache-version: 2 - - swift: "5.5" - container: "swift:5.5" - cache-version: 2 runs-on: ubuntu-latest container: ${{ matrix.container }} name: Linux diff --git a/Package.resolved b/Package.resolved index 6940989..6a788cb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,151 +1,158 @@ { - "object": { - "pins": [ - { - "package": "AEXML", - "repositoryURL": "https://github.com/tadija/AEXML", - "state": { - "branch": null, - "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3", - "version": "4.6.1" - } - }, - { - "package": "Logger", - "repositoryURL": "https://github.com/shibapm/Logger", - "state": { - "branch": null, - "revision": "53c3ecca5abe8cf46697e33901ee774236d94cce", - "version": "0.2.3" - } - }, - { - "package": "OctoKit", - "repositoryURL": "https://github.com/nerdishbynature/octokit.swift", - "state": { - "branch": null, - "revision": "f762f1566f7cd0e683b9329f169c28ab6ef993cc", - "version": "0.12.0" - } - }, - { - "package": "PathKit", - "repositoryURL": "https://github.com/kylef/PathKit.git", - "state": { - "branch": null, - "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", - "version": "1.0.1" - } - }, - { - "package": "Periphery", - "repositoryURL": "https://github.com/peripheryapp/periphery", - "state": { - "branch": null, - "revision": "3aee3892928eb4ee1fdf6d5917cc19951df5a0fd", - "version": "2.10.3" - } - }, - { - "package": "RequestKit", - "repositoryURL": "https://github.com/nerdishbynature/RequestKit.git", - "state": { - "branch": null, - "revision": "8b0258ea2a4345cbcac90509b764faacea12efb0", - "version": "3.2.1" - } - }, - { - "package": "Spectre", - "repositoryURL": "https://github.com/kylef/Spectre.git", - "state": { - "branch": null, - "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7", - "version": "0.10.1" - } - }, - { - "package": "danger-swift", - "repositoryURL": "https://github.com/danger/swift.git", - "state": { - "branch": null, - "revision": "0a4b52f4518974cbd2cc45c29d33cb54a303f81d", - "version": "3.15.0" - } - }, - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser", - "state": { - "branch": null, - "revision": "fddd1c00396eed152c45a46bea9f47b98e59301d", - "version": "1.2.0" - } - }, - { - "package": "SwiftIndexStore", - "repositoryURL": "https://github.com/kateinoigakukun/swift-indexstore", - "state": { - "branch": null, - "revision": "94261f627b5f82214b676d55809bb814814a3817", - "version": "0.2.0" - } - }, - { - "package": "SwiftShell", - "repositoryURL": "https://github.com/taji-taji/swift-shell.git", - "state": { - "branch": null, - "revision": "ebbf4c33f5c81bd89a2b038f98b35e373566d668", - "version": "1.0.1" - } - }, - { - "package": "SwiftSyntax", - "repositoryURL": "https://github.com/peripheryapp/swift-syntax", - "state": { - "branch": null, - "revision": "a2d31e8880224f5a619f24bf58c122836faf99ff", - "version": "1.0.0" - } - }, - { - "package": "swift-system", - "repositoryURL": "https://github.com/apple/swift-system", - "state": { - "branch": null, - "revision": "025bcb1165deab2e20d4eaba79967ce73013f496", - "version": "1.2.1" - } - }, - { - "package": "Version", - "repositoryURL": "https://github.com/mxcl/Version", - "state": { - "branch": null, - "revision": "1fe824b80d89201652e7eca7c9252269a1d85e25", - "version": "2.0.1" - } - }, - { - "package": "XcodeProj", - "repositoryURL": "https://github.com/tuist/xcodeproj", - "state": { - "branch": null, - "revision": "b6de1bfe021b861c94e7c83821b595083f74b997", - "version": "8.8.0" - } - }, - { - "package": "Yams", - "repositoryURL": "https://github.com/jpsim/Yams", - "state": { - "branch": null, - "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6", - "version": "5.0.1" - } - } - ] - }, - "version": 1 + "pins" : [ + { + "identity" : "aexml", + "kind" : "remoteSourceControl", + "location" : "https://github.com/tadija/AEXML", + "state" : { + "revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3", + "version" : "4.6.1" + } + }, + { + "identity" : "logger", + "kind" : "remoteSourceControl", + "location" : "https://github.com/shibapm/Logger", + "state" : { + "revision" : "53c3ecca5abe8cf46697e33901ee774236d94cce", + "version" : "0.2.3" + } + }, + { + "identity" : "octokit.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/nerdishbynature/octokit.swift", + "state" : { + "revision" : "f762f1566f7cd0e683b9329f169c28ab6ef993cc", + "version" : "0.12.0" + } + }, + { + "identity" : "pathkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kylef/PathKit.git", + "state" : { + "revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574", + "version" : "1.0.1" + } + }, + { + "identity" : "periphery", + "kind" : "remoteSourceControl", + "location" : "https://github.com/peripheryapp/periphery", + "state" : { + "revision" : "5182b803cd852276203ee3e3b5af753acde16d0f", + "version" : "2.15.0" + } + }, + { + "identity" : "requestkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/nerdishbynature/RequestKit.git", + "state" : { + "revision" : "8b0258ea2a4345cbcac90509b764faacea12efb0", + "version" : "3.2.1" + } + }, + { + "identity" : "spectre", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kylef/Spectre.git", + "state" : { + "revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7", + "version" : "0.10.1" + } + }, + { + "identity" : "swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/danger/swift.git", + "state" : { + "revision" : "0a4b52f4518974cbd2cc45c29d33cb54a303f81d", + "version" : "3.15.0" + } + }, + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser", + "state" : { + "revision" : "fddd1c00396eed152c45a46bea9f47b98e59301d", + "version" : "1.2.0" + } + }, + { + "identity" : "swift-filename-matcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ileitch/swift-filename-matcher", + "state" : { + "revision" : "17eaeaf60f2703e3ef826de94149c88a78953fd3", + "version" : "0.1.1" + } + }, + { + "identity" : "swift-indexstore", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ileitch/swift-indexstore", + "state" : { + "revision" : "246d455063ddc8faf3ad791c4488e1f60c59aabd", + "version" : "9.0.3" + } + }, + { + "identity" : "swift-shell", + "kind" : "remoteSourceControl", + "location" : "https://github.com/taji-taji/swift-shell.git", + "state" : { + "revision" : "ebbf4c33f5c81bd89a2b038f98b35e373566d668", + "version" : "1.0.1" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/peripheryapp/swift-syntax", + "state" : { + "revision" : "56ef324e094ad1e655ae7d8c8dabadc7e6bd64e9", + "version" : "1.0.2" + } + }, + { + "identity" : "swift-system", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-system", + "state" : { + "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496", + "version" : "1.2.1" + } + }, + { + "identity" : "version", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mxcl/Version", + "state" : { + "revision" : "1fe824b80d89201652e7eca7c9252269a1d85e25", + "version" : "2.0.1" + } + }, + { + "identity" : "xcodeproj", + "kind" : "remoteSourceControl", + "location" : "https://github.com/tuist/xcodeproj", + "state" : { + "revision" : "b6de1bfe021b861c94e7c83821b595083f74b997", + "version" : "8.8.0" + } + }, + { + "identity" : "yams", + "kind" : "remoteSourceControl", + "location" : "https://github.com/jpsim/Yams", + "state" : { + "revision" : "01835dc202670b5bb90d07f3eae41867e9ed29f6", + "version" : "5.0.1" + } + } + ], + "version" : 2 } diff --git a/Package.swift b/Package.swift index ad13a59..d11e73b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.8 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -21,20 +21,10 @@ let developTargets: [Target] = isDevelop ? [ dependencies: ["DangerSwiftPeriphery"]), ] : [] -#if compiler(>=5.7) -let dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/peripheryapp/periphery", from: "2.10.3"), -] -#else -let dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/peripheryapp/periphery", "2.0.0" ..< "2.10.0"), -] -#endif - let package = Package( name: "DangerSwiftPeriphery", platforms: [ - .macOS(.v12), + .macOS(.v13), ], products: [ .library( @@ -44,7 +34,8 @@ let package = Package( dependencies: [ .package(url: "https://github.com/danger/swift.git", from: "3.0.0"), .package(url: "https://github.com/taji-taji/swift-shell.git", from: "1.0.0"), - ] + dependencies, + .package(url: "https://github.com/peripheryapp/periphery", from: "2.15.0"), + ], targets: [ .target( name: "DangerSwiftPeriphery", diff --git a/README.md b/README.md index 22d7437..92a5a8b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This plugin will comment unreferenced code detected by periphery via Danger Swif ## Requirements -- Swift 5.5.2 or later +- Swift 5.8 or later ## Usage