Version 2.0.6

danger · Oct 6, 2019 · de3743f · de3743f
1 parent 67d71fd
commit de3743f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@
 
 ## Master
 
+## 2.0.6
+
 - Fix GitLabDSL parsing (missing arguments) [@fortmarek][] - [#283](https://github.com/danger/swift/pull/283)
 - Protect bitbucket cloud inline comment with all options being optional [@khoogheem][] - [#280](https://github.com/danger/swift/pull/280)
 

diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x |  bash -
 RUN apt-get install -y nodejs
 
 # Install danger-swift globally
-RUN git clone https://github.com/danger/danger-swift.git --single-branch --depth 1 --branch 2.0.5 _danger-swift
+RUN git clone https://github.com/danger/danger-swift.git --single-branch --depth 1 --branch 2.0.6 _danger-swift
 RUN cd _danger-swift && make install
 
 # Run Danger Swift via Danger JS, allowing for custom args

diff --git a/Documentation/reference/structs/Inline.md b/Documentation/reference/structs/Inline.md
@@ -16,11 +16,11 @@ public let from: Int?
 ### `to`
 
 ```swift
-public let to: Int // swiftlint:disable:this identifier_name
+public let to: Int? // swiftlint:disable:this identifier_name
 ```
 
 ### `path`
 
 ```swift
-public let path: String
+public let path: String?
 ```
diff --git a/Documentation/reference/structs/MergeRequest.md b/Documentation/reference/structs/MergeRequest.md
@@ -10,13 +10,13 @@ public struct MergeRequest: Decodable, Equatable
 ### `allowCollaboration`
 
 ```swift
-public let allowCollaboration: Bool
+public let allowCollaboration: Bool?
 ```
 
 ### `allowMaintainerToPush`
 
 ```swift
-public let allowMaintainerToPush: Bool
+public let allowMaintainerToPush: Bool?
 ```
 
 ### `approvalsBeforeMerge`

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 TOOL_NAME = danger-swift
 # Get this from the Danger.swift someday
-VERSION = 2.0.5
+VERSION = 2.0.6
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)

diff --git 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,23 +18,23 @@ let package = Package(
         .package(url: "https://github.com/nerdishbynature/octokit.swift", from: "0.9.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.28.1"), // dev
-        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.0.0"), // dev
-        .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
-        .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), // dev
-        .package(url: "https://github.com/eneko/SourceDocs", from: "0.5.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.28.1"), // dev
+//        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.0.0"), // dev
+//        .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
+//        .package(url: "https://github.com/jpsim/Yams.git", from: "1.0.0"), // dev
+//        .package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
     ],
     targets: [
-        .target(name: "Danger-Swift", dependencies: ["Danger", "Yams"]), // dev
+//        .target(name: "Danger-Swift", dependencies: ["Danger", "Yams"]), // dev
         .target(name: "DangerShellExecutor"),
         .target(name: "Danger", dependencies: ["OctoKit", "Logger", "DangerShellExecutor"]),
         .target(name: "RunnerLib", dependencies: ["Logger", "DangerShellExecutor"]),
         .target(name: "Runner", dependencies: ["RunnerLib", "MarathonCore", "Logger"]),
         .target(name: "DangerFixtures", dependencies: ["Danger"]),
-        .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev
-        .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"]), // dev
+//        .testTarget(name: "DangerTests", dependencies: ["Danger", "DangerFixtures", "SnapshotTesting"]), // dev
+//        .testTarget(name: "RunnerLibTests", dependencies: ["RunnerLib", "SnapshotTesting"]), // dev
     ]
 )
 

diff --git 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.5" // swiftlint:disable:this identifier_name
+let DangerVersion = "2.0.6" // swiftlint:disable:this identifier_name
 let MinimumDangerJSVersion = "6.1.6" // swiftlint:disable:this identifier_name
 
 private func runCommand(_ command: DangerCommand, logger: Logger) throws {