diff --git a/CHANGELOG.md b/CHANGELOG.md index aebd628c..74b271d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ ## Master +## 3.0.0 + - Danger dependencies resolver [@f-meloni][] - [#303](https://github.com/danger/swift/pull/303) - Update swift toolchain to 5.0 [@f-meloni][] - [#307](https://github.com/danger/swift/pull/307) - Move to swift 5.1 [@f-meloni][] - [#275](https://github.com/danger/swift/pull/275) diff --git a/Makefile b/Makefile index aa27b4e6..592b7474 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TOOL_NAME = danger-swift # Get this from the Danger.swift someday -VERSION = 2.0.7 +VERSION = 3.0.0 PREFIX = /usr/local INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME) diff --git a/Package.swift b/Package.swift index ba80a3f6..8d519440 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( products: [ .library(name: "Danger", type: .dynamic, targets: ["Danger"]), .library(name: "DangerFixtures", type: .dynamic, 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: [ @@ -18,24 +18,24 @@ let package = Package( .package(url: "https://github.com/nerdishbynature/octokit.swift", from: "0.10.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(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/eneko/SourceDocs", from: "0.6.0"), // 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(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/eneko/SourceDocs", from: "0.6.0"), // dev ], targets: [ - .target(name: "Danger-Swift", dependencies: ["Danger"]), // dev +// .target(name: "Danger-Swift", dependencies: ["Danger"]), // dev .target(name: "DangerShellExecutor"), .target(name: "DangerDependenciesResolver", dependencies: ["DangerShellExecutor", "Version", "Logger"]), .target(name: "Danger", dependencies: ["OctoKit", "Logger", "DangerShellExecutor"]), .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"]), // dev - .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"]), // dev +// .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev +// .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"]), // dev +// .testTarget(name: "DangerDependenciesResolverTests", dependencies: ["DangerDependenciesResolver", "SnapshotTesting"]), // dev ] ) diff --git a/Sources/Runner/main.swift b/Sources/Runner/main.swift index 35503735..1a24709d 100644 --- a/Sources/Runner/main.swift +++ b/Sources/Runner/main.swift @@ -3,7 +3,7 @@ import Logger import RunnerLib /// Version for showing in verbose mode -let DangerVersion = "2.0.7" // swiftlint:disable:this identifier_name +let DangerVersion = "3.0.0" // swiftlint:disable:this identifier_name let MinimumDangerJSVersion = "6.1.6" // swiftlint:disable:this identifier_name private func runCommand(_ command: DangerCommand, logger: Logger) throws {