From 623590acd1b2c9d7a2f3de49cc1cf8edcb5a0c0e Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 1 Feb 2018 10:54:49 -0800 Subject: [PATCH] Update dependencies --- Cartfile | 2 +- Cartfile.private | 4 +-- Cartfile.resolved | 8 ++--- Carthage/Checkouts/Commandant | 2 +- Carthage/Checkouts/SWXMLHash | 2 +- Carthage/Checkouts/SourceKitten | 2 +- Carthage/Checkouts/Yams | 2 +- Package.resolved | 30 +++++++++---------- Package.swift | 6 ++-- .../Extensions/File+Cache.swift | 2 +- .../Commands/AutoCorrectCommand.swift | 8 ++--- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Cartfile b/Cartfile index 2555c753b0..719fdd56eb 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "jpsim/SourceKitten" ~> 0.18.4 +github "jpsim/SourceKitten" ~> 0.19.1 github "scottrhoyt/SwiftyTextTable" ~> 0.8.0 diff --git a/Cartfile.private b/Cartfile.private index f7d2f85af5..e96873b379 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "Carthage/Commandant" "master" +github "Carthage/Commandant" ~> 0.13.0 github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c" -github "jpsim/Yams" ~> 0.4 +github "jpsim/Yams" ~> 0.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index a2b78a13c1..8aa49184e5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,7 @@ -github "Carthage/Commandant" "ab5f20d3e845dc3845eb4c79a4bd8d5ac8af5e1c" +github "Carthage/Commandant" "0.13.0" github "antitypical/Result" "3.2.4" -github "drmohundro/SWXMLHash" "4.2.5" -github "jpsim/SourceKitten" "0.18.4" -github "jpsim/Yams" "0.4.1" +github "drmohundro/SWXMLHash" "4.3.6" +github "jpsim/SourceKitten" "0.19.1" +github "jpsim/Yams" "0.5.0" github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c" github "scottrhoyt/SwiftyTextTable" "0.8.0" diff --git a/Carthage/Checkouts/Commandant b/Carthage/Checkouts/Commandant index ab5f20d3e8..7f29606ec3 160000 --- a/Carthage/Checkouts/Commandant +++ b/Carthage/Checkouts/Commandant @@ -1 +1 @@ -Subproject commit ab5f20d3e845dc3845eb4c79a4bd8d5ac8af5e1c +Subproject commit 7f29606ec3a2054a601f0e72f562a104dbc1a11a diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash index 12496b3703..4e7f5af633 160000 --- a/Carthage/Checkouts/SWXMLHash +++ b/Carthage/Checkouts/SWXMLHash @@ -1 +1 @@ -Subproject commit 12496b370363034ccc919e1d72a99b9970b4941e +Subproject commit 4e7f5af6331735d39fc357b2c71c3bb15af97c8f diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten index 71e8297e5d..e06eb73049 160000 --- a/Carthage/Checkouts/SourceKitten +++ b/Carthage/Checkouts/SourceKitten @@ -1 +1 @@ -Subproject commit 71e8297e5d95118588f8aa8e1de892762346dc9d +Subproject commit e06eb730499439ae32c5fbb6f72809ebec2371fd diff --git a/Carthage/Checkouts/Yams b/Carthage/Checkouts/Yams index 90a76f3cdb..95f45caf07 160000 --- a/Carthage/Checkouts/Yams +++ b/Carthage/Checkouts/Yams @@ -1 +1 @@ -Subproject commit 90a76f3cdb552b8e6aea5dabdd6c3578b8a7ad45 +Subproject commit 95f45caf07472ec78223ebada45255086a85b01a diff --git a/Package.resolved b/Package.resolved index 2ac92981ee..3daeffec23 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,9 +14,9 @@ "package": "Commandant", "repositoryURL": "https://github.com/Carthage/Commandant.git", "state": { - "branch": "master", - "revision": "3ff9019f7afd189c43a349f819684988031053a0", - "version": null + "branch": null, + "revision": "7f29606ec3a2054a601f0e72f562a104dbc1a11a", + "version": "0.13.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/Quick/Nimble.git", "state": { "branch": null, - "revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4", - "version": "7.0.2" + "revision": "22800b0954c89344bb8c87f8ab93378076716fb7", + "version": "7.0.3" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", "state": { "branch": null, - "revision": "12496b370363034ccc919e1d72a99b9970b4941e", - "version": "4.2.5" + "revision": "4e7f5af6331735d39fc357b2c71c3bb15af97c8f", + "version": "4.3.6" } }, { @@ -69,17 +69,17 @@ "repositoryURL": "https://github.com/jpsim/SourceKitten.git", "state": { "branch": null, - "revision": "71e8297e5d95118588f8aa8e1de892762346dc9d", - "version": "0.18.4" + "revision": "e06eb730499439ae32c5fbb6f72809ebec2371fd", + "version": "0.19.1" } }, { "package": "SwiftyTextTable", - "repositoryURL": "https://github.com/jpsim/SwiftyTextTable.git", + "repositoryURL": "https://github.com/scottrhoyt/SwiftyTextTable.git", "state": { - "branch": "characters", - "revision": "fb31390e74392773d0f587a3b1481ee65056e075", - "version": null + "branch": null, + "revision": "89728970c0a244c43f29c4155a1b1dc20b3c4633", + "version": "0.8.0" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/jpsim/Yams.git", "state": { "branch": null, - "revision": "90a76f3cdb552b8e6aea5dabdd6c3578b8a7ad45", - "version": "0.4.1" + "revision": "95f45caf07472ec78223ebada45255086a85b01a", + "version": "0.5.0" } } ] diff --git a/Package.swift b/Package.swift index d138b2fbb1..4468bb999a 100644 --- a/Package.swift +++ b/Package.swift @@ -8,9 +8,9 @@ let package = Package( .library(name: "SwiftLintFramework", targets: ["SwiftLintFramework"]) ], dependencies: [ - .package(url: "https://github.com/Carthage/Commandant.git", .branch("master")), - .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.18.4"), - .package(url: "https://github.com/jpsim/Yams.git", from: "0.4.1"), + .package(url: "https://github.com/Carthage/Commandant.git", from: "0.13.0"), + .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.19.1"), + .package(url: "https://github.com/jpsim/Yams.git", from: "0.5.0"), .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.8.0"), ], targets: [ diff --git a/Source/SwiftLintFramework/Extensions/File+Cache.swift b/Source/SwiftLintFramework/Extensions/File+Cache.swift index fe989c97bc..611daf4b33 100644 --- a/Source/SwiftLintFramework/Extensions/File+Cache.swift +++ b/Source/SwiftLintFramework/Extensions/File+Cache.swift @@ -11,7 +11,7 @@ import SourceKittenFramework private var responseCache = Cache({ file -> [String: SourceKitRepresentable]? in do { - return try Request.editorOpen(file: file).failableSend() + return try Request.editorOpen(file: file).send() } catch let error as Request.Error { queuedPrintError(error.description) return nil diff --git a/Source/swiftlint/Commands/AutoCorrectCommand.swift b/Source/swiftlint/Commands/AutoCorrectCommand.swift index 4518230218..2507a88227 100644 --- a/Source/swiftlint/Commands/AutoCorrectCommand.swift +++ b/Source/swiftlint/Commands/AutoCorrectCommand.swift @@ -45,10 +45,10 @@ struct AutoCorrectCommand: CommandProtocol { queuedPrint(correctionLogs.joined(separator: "\n")) } if options.format { - let formattedContents = linter.file.format(trimmingTrailingWhitespace: true, - useTabs: useTabs, - indentWidth: indentWidth) - _ = try? formattedContents + let formattedContents = try? linter.file.format(trimmingTrailingWhitespace: true, + useTabs: useTabs, + indentWidth: indentWidth) + _ = try? formattedContents? .write(toFile: linter.file.path!, atomically: true, encoding: .utf8) } }.flatMap { files in