Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jpsim committed Feb 1, 2018
1 parent c4febda commit 623590a
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.18.4
github "jpsim/SourceKitten" ~> 0.19.1
github "scottrhoyt/SwiftyTextTable" ~> 0.8.0
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Commandant
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SourceKitten
Submodule SourceKitten updated 73 files
+48 −58 .circleci/config.yml
+1 −1 .swift-version
+43 −0 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.private
+5 −5 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+1 −1 Carthage/Checkouts/Result
+1 −1 Carthage/Checkouts/SWXMLHash
+1 −1 Carthage/Checkouts/Yams
+1 −1 Carthage/Checkouts/xcconfigs
+28 −30 Makefile
+79 −0 Package.resolved
+43 −19 Package.swift
+0 −47 Package@swift-4.swift
+73 −0 README.md
+15 −19 Source/SourceKittenFramework/Clang+SourceKitten.swift
+12 −7 Source/SourceKittenFramework/File.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+3 −6 Source/SourceKittenFramework/JSONOutput.swift
+75 −84 Source/SourceKittenFramework/Request.swift
+2 −13 Source/SourceKittenFramework/SourceDeclaration.swift
+2 −28 Source/SourceKittenFramework/String+SourceKitten.swift
+3 −2 Source/SourceKittenFramework/Structure.swift
+2 −0 Source/SourceKittenFramework/SwiftDocKey.swift
+1 −1 Source/SourceKittenFramework/SwiftDocs.swift
+3 −2 Source/SourceKittenFramework/SyntaxMap.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+1 −1 Source/SourceKittenFramework/library_wrapper_CXString.swift
+36 −36 Source/SourceKittenFramework/library_wrapper_Index.swift
+22 −22 Source/SourceKittenFramework/library_wrapper_sourcekitd.swift
+6 −2 Source/sourcekitten/CompleteCommand.swift
+0 −41 Source/sourcekitten/Components.plist
+5 −0 Source/sourcekitten/Errors.swift
+11 −7 Source/sourcekitten/FormatCommand.swift
+6 −2 Source/sourcekitten/IndexCommand.swift
+1 −1 Source/sourcekitten/Info.plist
+15 −11 Source/sourcekitten/StructureCommand.swift
+11 −7 Source/sourcekitten/SyntaxCommand.swift
+17 −13 Source/sourcekitten/YamlRequestCommand.swift
+0 −1 Source/sourcekitten/main.swift
+1 −1 SourceKittenFramework.podspec
+2 −2 Tests/SourceKittenFrameworkTests/CodeCompletionTests.swift
+7 −8 Tests/SourceKittenFrameworkTests/DocInfoTests.swift
+1 −3 Tests/SourceKittenFrameworkTests/FileTests.swift
+0 −756 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle.json
+0 −565 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex.json
+0 −5,940 Tests/SourceKittenFrameworkTests/Fixtures/Commandant.json
+2,832 −2,264 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-3.2.json
+4,947 −0 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM@swift-3.2.json
+0 −207 Tests/SourceKittenFrameworkTests/Fixtures/DocInfo.json
+0 −338 Tests/SourceKittenFrameworkTests/Fixtures/Extension.json
+540 −540 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-3.2.json
+426 −426 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycleIndex@swift-3.2.json
+4,989 −0 Tests/SourceKittenFrameworkTests/Fixtures/LinuxCommandantSPM@swift-3.2.json
+317 −317 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-3.2.2.json
+317 −317 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-3.2.json
+0 −214 Tests/SourceKittenFrameworkTests/Fixtures/ModuleInfo.json
+2 −2 Tests/SourceKittenFrameworkTests/Fixtures/Musician.h
+7 −2 Tests/SourceKittenFrameworkTests/Fixtures/Musician.json
+0 −5,958 Tests/SourceKittenFrameworkTests/Fixtures/Realm.json
+196 −5 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-3.2.json
+0 −108 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion.json
+0 −64 Tests/SourceKittenFrameworkTests/Fixtures/Subscript.json
+2 −0 Tests/SourceKittenFrameworkTests/Fixtures/SuperScript.json
+20 −1 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+4 −4 Tests/SourceKittenFrameworkTests/OffsetMapTests.swift
+4 −4 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+4 −4 Tests/SourceKittenFrameworkTests/StringTests.swift
+4 −4 Tests/SourceKittenFrameworkTests/StructureTests.swift
+80 −13 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
+3 −3 Tests/SourceKittenFrameworkTests/SyntaxTests.swift
+6 −6 sourcekitten.xcodeproj/project.pbxproj
30 changes: 15 additions & 15 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"package": "Commandant",
"repositoryURL": "https://github.com/Carthage/Commandant.git",
"state": {
"branch": "master",
"revision": "3ff9019f7afd189c43a349f819684988031053a0",
"version": null
"branch": null,
"revision": "7f29606ec3a2054a601f0e72f562a104dbc1a11a",
"version": "0.13.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4",
"version": "7.0.2"
"revision": "22800b0954c89344bb8c87f8ab93378076716fb7",
"version": "7.0.3"
}
},
{
Expand All @@ -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"
}
},
{
Expand All @@ -69,26 +69,26 @@
"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"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "90a76f3cdb552b8e6aea5dabdd6c3578b8a7ad45",
"version": "0.4.1"
"revision": "95f45caf07472ec78223ebada45255086a85b01a",
"version": "0.5.0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintFramework/Extensions/File+Cache.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Source/swiftlint/Commands/AutoCorrectCommand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 623590a

Please sign in to comment.