Merge pull request #39 from shibapm/f-meloni-patch-1

Use toolchain 5.1

.swift-version

@@ -1 +1 @@
-5.0
+5.1

.travis.yml

@@ -2,7 +2,7 @@ language: generic
 matrix:
   include:
     - os: osx
-      osx_image: xcode10.2
+      osx_image: xcode11.4
       script:
         - swift test
         - swift build --disable-sandbox -c release
@@ -14,7 +14,7 @@ matrix:
       dist: trusty
       install:
         - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
-        - swiftenv global 5.0
+        - swiftenv global 5.1
       script:
         - swift test
         - swift build --disable-sandbox -c release

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/RocketLib/Checks.swift

@@ -2,7 +2,7 @@ enum PreReleseCheck: String {
     case cleanGit = "clean_git"
 
     func check(dictionary _: [String: Any]?) -> Check {
-        return checkType.init()
+        checkType.init()
     }
 
     private var checkType: Check.Type {

Sources/RocketLib/Executors/ScriptLauncher.swift

@@ -14,7 +14,7 @@ protocol ScriptLaunching {
 extension ScriptLaunching {
     @discardableResult
     func launchScript(withContent content: String) throws -> String {
-        return try launchScript(withContent: content, version: nil)
+        try launchScript(withContent: content, version: nil)
     }
 }
 

Sources/RocketLib/Executors/Utils/DevDependenciesModifier.swift

@@ -42,14 +42,14 @@ struct DevDependenciesModifier: DevDependenciesModifing {
     }
 
     private func hideDependencyOnLine(_ line: String) -> String {
-        return commentString + line
+        commentString + line
     }
 
     private func unhideDependencyOnLine(_ line: String) -> String {
-        return String(line[String.Index(utf16Offset: 2, in: line) ..< line.endIndex])
+        String(line[String.Index(utf16Offset: 2, in: line) ..< line.endIndex])
     }
 
     private func isDevDependencyLine(line: String) -> Bool {
-        return line.contains("// dev") || line.contains("//dev")
+        line.contains("// dev") || line.contains("//dev")
     }
 }

Sources/RocketLib/Executors/Utils/NoVerifyParameterInserter.swift

@@ -7,7 +7,7 @@ protocol NoVerifyParameterInserting {
 
 extension NoVerifyParameterInserting {
     func insertNoVerifyParameterIfNeeded(string: String, noVerifyParameter: Bool?) -> String {
-        return shouldAddNoVerifyParameter(noVerifyParameter: noVerifyParameter) ? string + " --no-verify" : string
+        shouldAddNoVerifyParameter(noVerifyParameter: noVerifyParameter) ? string + " --no-verify" : string
     }
 
     private func shouldAddNoVerifyParameter(noVerifyParameter: Bool?) -> Bool {

Sources/RocketLib/Step.swift

@@ -10,7 +10,7 @@ public enum Step: String {
     case swiftScript = "swift_script"
 
     func executor(dictionary: [String: Any]?) -> StepExecutor {
-        return executorType.init(step: self, dictionary: dictionary)
+        executorType.init(step: self, dictionary: dictionary)
     }
 
     private var executorType: StepExecutor.Type {

Tests/RocketTests/BranchExecutorTests.swift

@@ -19,7 +19,7 @@ final class BranchExecutorTests: ScriptLauncherTestCase {
     }
 
     private func givenABranchExecutor(dictionary: [String: Any]?) -> BranchExecutor {
-        return BranchExecutor(step: .branch, dictionary: dictionary, scriptLauncher: scriptLauncher)
+        BranchExecutor(step: .branch, dictionary: dictionary, scriptLauncher: scriptLauncher)
     }
 
     private func executeStep(withDictionary dictionary: [String: Any]?) {

Tests/RocketTests/DevDependenciesModifierTests.swift

@@ -36,7 +36,7 @@ final class DevDependenciesModifierTests: XCTestCase {
     }
 
     private var devDependencyPackage: String {
-        return """
+        """
         // swift-tools-version:4.2
         import PackageDescription
 
@@ -70,7 +70,7 @@ final class DevDependenciesModifierTests: XCTestCase {
     }
 
     private var hiddenDevDependencyPackage: String {
-        return """
+        """
         // swift-tools-version:4.2
         import PackageDescription
 

Tests/RocketTests/GitAddExecutorTests.swift

@@ -19,7 +19,7 @@ final class GitAddExecutorTests: ScriptLauncherTestCase {
     }
 
     private func givenAGitAddExecutor(dictionary: [String: Any]?) -> GitAddExecutor {
-        return GitAddExecutor(step: .gitAdd, dictionary: dictionary, scriptLauncher: scriptLauncher)
+        GitAddExecutor(step: .gitAdd, dictionary: dictionary, scriptLauncher: scriptLauncher)
     }
 
     private func executeStep(withDictionary dictionary: [String: Any]?) {

Tests/RocketTests/NewVersionProviderTests.swift

@@ -23,6 +23,6 @@ final class NewVersionProviderTests: XCTestCase {
 
 private class FakeCurrentVersionProvider: CurrentVersionProviding {
     func currentVersion() throws -> String {
-        return "1.1.1"
+        "1.1.1"
     }
 }

Tests/RocketTests/ScriptExecutorTests.swift

@@ -26,7 +26,7 @@ final class ScriptExecutorTests: ScriptLauncherTestCase {
     }
 
     private func givenAScriptExecutor(dictionary: [String: Any]?) -> ScriptExecutor {
-        return ScriptExecutor(step: .script, dictionary: dictionary, scriptLauncher: scriptLauncher)
+        ScriptExecutor(step: .script, dictionary: dictionary, scriptLauncher: scriptLauncher)
     }
 
     private func executeStep(withDictionary dictionary: [String: Any]?) {

Tests/RocketTests/StepsParserTests.swift

@@ -145,7 +145,7 @@ final class StepsParserTests: XCTestCase {
 
 extension PushParameters: Equatable {
     public static func == (lhs: PushParameters, rhs: PushParameters) -> Bool {
-        return lhs.branch == rhs.branch &&
+        lhs.branch == rhs.branch &&
             lhs.remote == rhs.remote
     }
 }

Tests/RocketTests/Utils/SpyPrinter.swift

@@ -10,6 +10,6 @@ final class SpyPrinter: Printing {
 
 extension Logger {
     static var testLogger: Logger {
-        return Logger(printer: SpyPrinter())
+        Logger(printer: SpyPrinter())
     }
 }

Tests/RocketTests/Utils/StubbedFileManager.swift

@@ -4,6 +4,6 @@ final class StubbedFileManager: FileManager {
     var fileExistsResult = true
 
     override func fileExists(atPath _: String) -> Bool {
-        return fileExistsResult
+        fileExistsResult
     }
 }

Tests/RocketTests/XCTestManifests.swift

@@ -197,7 +197,7 @@
     }
 
     public func __allTests() -> [XCTestCaseEntry] {
-        return [
+        [
             testCase(BranchExecutorTests.__allTests__BranchExecutorTests),
             testCase(ChecksParserTests.__allTests__ChecksParserTests),
             testCase(CleanGitStatusCheckTests.__allTests__CleanGitStatusCheckTests),