Skip to content

Commit de3743f

Browse files
committed
Version 2.0.6
1 parent 67d71fd commit de3743f

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
## Master
1515

16+
## 2.0.6
17+
1618
- Fix GitLabDSL parsing (missing arguments) [@fortmarek][] - [#283](https://github.com/danger/swift/pull/283)
1719
- Protect bitbucket cloud inline comment with all options being optional [@khoogheem][] - [#280](https://github.com/danger/swift/pull/280)
1820

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
1212
RUN apt-get install -y nodejs
1313

1414
# Install danger-swift globally
15-
RUN git clone https://github.com/danger/danger-swift.git --single-branch --depth 1 --branch 2.0.5 _danger-swift
15+
RUN git clone https://github.com/danger/danger-swift.git --single-branch --depth 1 --branch 2.0.6 _danger-swift
1616
RUN cd _danger-swift && make install
1717

1818
# Run Danger Swift via Danger JS, allowing for custom args

Documentation/reference/structs/Inline.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public let from: Int?
1616
### `to`
1717

1818
```swift
19-
public let to: Int // swiftlint:disable:this identifier_name
19+
public let to: Int? // swiftlint:disable:this identifier_name
2020
```
2121

2222
### `path`
2323

2424
```swift
25-
public let path: String
25+
public let path: String?
2626
```

Documentation/reference/structs/MergeRequest.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public struct MergeRequest: Decodable, Equatable
1010
### `allowCollaboration`
1111

1212
```swift
13-
public let allowCollaboration: Bool
13+
public let allowCollaboration: Bool?
1414
```
1515

1616
### `allowMaintainerToPush`
1717

1818
```swift
19-
public let allowMaintainerToPush: Bool
19+
public let allowMaintainerToPush: Bool?
2020
```
2121

2222
### `approvalsBeforeMerge`

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TOOL_NAME = danger-swift
22
# Get this from the Danger.swift someday
3-
VERSION = 2.0.5
3+
VERSION = 2.0.6
44

55
PREFIX = /usr/local
66
INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)

Package.swift

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
products: [
1010
.library(name: "Danger", type: .dynamic, targets: ["Danger"]),
1111
.library(name: "DangerFixtures", type: .dynamic, targets: ["DangerFixtures"]),
12-
.library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev
12+
// .library(name: "DangerDeps", type: .dynamic, targets: ["Danger-Swift"]), // dev
1313
.executable(name: "danger-swift", targets: ["Runner"]),
1414
],
1515
dependencies: [
@@ -18,23 +18,23 @@ let package = Package(
1818
.package(url: "https://github.com/nerdishbynature/octokit.swift", from: "0.9.0"),
1919
// Danger Plugins
2020
// Dev dependencies
21-
.package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev
22-
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev
23-
.package(url: "https://github.com/Realm/SwiftLint", from: "0.28.1"), // dev
24-
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.0.0"), // dev
25-
.package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
26-
.package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), // dev
27-
.package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
21+
// .package(url: "https://github.com/shibapm/Komondor", from: "1.0.0"), // dev
22+
// .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev
23+
// .package(url: "https://github.com/Realm/SwiftLint", from: "0.28.1"), // dev
24+
// .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.0.0"), // dev
25+
// .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
26+
// .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), // dev
27+
// .package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
2828
],
2929
targets: [
30-
.target(name: "Danger-Swift", dependencies: ["Danger", "Yams"]), // dev
30+
// .target(name: "Danger-Swift", dependencies: ["Danger", "Yams"]), // dev
3131
.target(name: "DangerShellExecutor"),
3232
.target(name: "Danger", dependencies: ["OctoKit", "Logger", "DangerShellExecutor"]),
3333
.target(name: "RunnerLib", dependencies: ["Logger", "DangerShellExecutor"]),
3434
.target(name: "Runner", dependencies: ["RunnerLib", "MarathonCore", "Logger"]),
3535
.target(name: "DangerFixtures", dependencies: ["Danger"]),
36-
.testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev
37-
.testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"]), // dev
36+
// .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev
37+
// .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"]), // dev
3838
]
3939
)
4040

Sources/Runner/main.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Logger
33
import RunnerLib
44

55
/// Version for showing in verbose mode
6-
let DangerVersion = "2.0.5" // swiftlint:disable:this identifier_name
6+
let DangerVersion = "2.0.6" // swiftlint:disable:this identifier_name
77
let MinimumDangerJSVersion = "6.1.6" // swiftlint:disable:this identifier_name
88

99
private func runCommand(_ command: DangerCommand, logger: Logger) throws {

0 commit comments

Comments
 (0)