From f11e2595b0e02ae3792991699ffe6529befff6ec Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Wed, 13 Oct 2021 10:35:01 +0200 Subject: [PATCH 1/5] Update Package.swift --- Package.swift | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index 4a851e72..8cd5e130 100644 --- a/Package.swift +++ b/Package.swift @@ -1,15 +1,13 @@ // swift-tools-version:5.3 - import PackageDescription // Version number can be found in Source/Danger/Danger.swift - let package = Package( name: "danger-swift", products: [ .library(name: "Danger", type: .dynamic, targets: ["Danger"]), .library(name: "DangerFixtures", type: .dynamic, targets: ["DangerFixtures"]), - .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), +// .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev .executable(name: "danger-swift", targets: ["Runner"]), ], dependencies: [ @@ -18,12 +16,12 @@ let package = Package( .package(name: "OctoKit", url: "https://github.com/nerdishbynature/octokit.swift", from: "0.11.0"), // Danger Plugins // Dev dependencies - .package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev - .package(url: "https://github.com/Realm/SwiftLint", from: "0.38.0"), // dev - .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"), // dev - .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev - .package(url: "https://github.com/SwiftDocOrg/swift-doc", .branch("1.0.0-rc.1")), // dev +// .package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev +// .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev +// .package(url: "https://github.com/Realm/SwiftLint", from: "0.38.0"), // dev +// .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"), // dev +// .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev +// .package(url: "https://github.com/SwiftDocOrg/swift-doc", .branch("1.0.0-rc.1")), // dev ], targets: [ .target(name: "Danger-Swift", dependencies: ["Danger"]), @@ -33,9 +31,9 @@ let package = Package( .target(name: "RunnerLib", dependencies: ["Logger", "DangerShellExecutor"]), .target(name: "Runner", dependencies: ["RunnerLib", "Logger", "DangerDependenciesResolver"]), .target(name: "DangerFixtures", dependencies: ["Danger"]), - .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev - .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev - .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev +// .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev +// .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev +// .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev ] ) From 077c7071768657a7ac2f19448b6fd5dd5c3989d8 Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Mon, 25 Oct 2021 16:05:36 +0200 Subject: [PATCH 2/5] Remove dynamic type Since it's no longer needed for Swift 5.5 --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 8cd5e130..3be7fc7c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,12 +1,12 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 import PackageDescription // Version number can be found in Source/Danger/Danger.swift let package = Package( name: "danger-swift", products: [ - .library(name: "Danger", type: .dynamic, targets: ["Danger"]), - .library(name: "DangerFixtures", type: .dynamic, targets: ["DangerFixtures"]), + .library(name: "Danger", targets: ["Danger"]), + .library(name: "DangerFixtures", targets: ["DangerFixtures"]), // .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev .executable(name: "danger-swift", targets: ["Runner"]), ], From bd62d4ecbcb753c7618f2b09381bd80088c96d2f Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Mon, 25 Oct 2021 20:33:34 +0200 Subject: [PATCH 3/5] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 3be7fc7c..a6600870 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.3 import PackageDescription // Version number can be found in Source/Danger/Danger.swift From 138c87434119e9149bb8769c4a38c9a601a1d091 Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Wed, 27 Oct 2021 10:58:17 +0200 Subject: [PATCH 4/5] Revert hiding of dev dependencies --- Package.swift | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Package.swift b/Package.swift index a6600870..b04c849d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,13 +1,15 @@ // swift-tools-version:5.3 + import PackageDescription // Version number can be found in Source/Danger/Danger.swift + let package = Package( name: "danger-swift", products: [ .library(name: "Danger", targets: ["Danger"]), .library(name: "DangerFixtures", targets: ["DangerFixtures"]), -// .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev + .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev .executable(name: "danger-swift", targets: ["Runner"]), ], dependencies: [ @@ -16,12 +18,12 @@ let package = Package( .package(name: "OctoKit", url: "https://github.com/nerdishbynature/octokit.swift", from: "0.11.0"), // Danger Plugins // Dev dependencies -// .package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev -// .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev -// .package(url: "https://github.com/Realm/SwiftLint", from: "0.38.0"), // dev -// .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"), // dev -// .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev -// .package(url: "https://github.com/SwiftDocOrg/swift-doc", .branch("1.0.0-rc.1")), // dev + .package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev + .package(url: "https://github.com/Realm/SwiftLint", from: "0.38.0"), // dev + .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"), // dev + .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev + .package(url: "https://github.com/SwiftDocOrg/swift-doc", .branch("1.0.0-rc.1")), // dev ], targets: [ .target(name: "Danger-Swift", dependencies: ["Danger"]), @@ -31,9 +33,9 @@ let package = Package( .target(name: "RunnerLib", dependencies: ["Logger", "DangerShellExecutor"]), .target(name: "Runner", dependencies: ["RunnerLib", "Logger", "DangerDependenciesResolver"]), .target(name: "DangerFixtures", dependencies: ["Danger"]), -// .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev -// .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev -// .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev + .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev + .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev + .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"], exclude: ["__Snapshots__"]), // dev ] ) From 1e0931decd3b008e1209fb109e5bbdeb6bc87eae Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Wed, 27 Oct 2021 14:48:16 +0200 Subject: [PATCH 5/5] Add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7197dbc..ff2454ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ ## Master +## Next +- Add support for Swift 5.5 and Xcode 13 [@avdlee][] - [#480](https://github.com/danger/swift/pull/480) + ## 3.12.1 - Comment Danger's internal framework on release [@f-meloni][] - [#477](https://github.com/danger/swift/pull/477)