Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history 
mostly to address previous deprecation warnings when compiling with
Swift 4.0.2.
  • Loading branch information
@jpsim
jpsim committed Nov 10, 2017
1 parent 81030d6 commit 258ed9c
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
url = https://github.com/jpsim/SourceKitten.git
[submodule "Carthage/Checkouts/SwiftyTextTable"]
path = Carthage/Checkouts/SwiftyTextTable
url = https://github.com/scottrhoyt/SwiftyTextTable.git
url = https://github.com/jpsim/SwiftyTextTable.git
[submodule "Carthage/Checkouts/Yams"]
path = Carthage/Checkouts/Yams
url = https://github.com/jpsim/Yams.git
4 changes: 2 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" ~> 0.18.2
github "scottrhoyt/SwiftyTextTable" ~> 0.7.0
github "jpsim/SourceKitten" ~> 0.18.4
github "jpsim/SwiftyTextTable" "characters"
2 changes: 1 addition & 1 deletion Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Carthage/Commandant" "master"
github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c"
github "jpsim/Yams" ~> 0.3
github "jpsim/Yams" ~> 0.4
10 changes: 5 additions & 5 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "Carthage/Commandant" "d06c7471ac8747e1bc8e538eb12d44aeb28b08d5"
github "Carthage/Commandant" "3ff9019f7afd189c43a349f819684988031053a0"
github "antitypical/Result" "3.2.4"
github "drmohundro/SWXMLHash" "4.2.3"
github "jpsim/SourceKitten" "0.18.2"
github "jpsim/Yams" "0.3.7"
github "drmohundro/SWXMLHash" "4.2.5"
github "jpsim/SourceKitten" "0.18.4"
github "jpsim/SwiftyTextTable" "fb31390e74392773d0f587a3b1481ee65056e075"
github "jpsim/Yams" "0.4.1"
github "jspahrsummers/xcconfigs" "4ac967d12f72c2ccc7f34d163268d09296923a7c"
github "scottrhoyt/SwiftyTextTable" "0.7.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Commandant
Submodule Commandant updated 2 files
+1 −1 Sources/Commandant/ArgumentParser.swift
+2 −2 Sources/Commandant/HelpCommand.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SWXMLHash
Submodule SWXMLHash updated 13 files
+1 −1 .swift-version
+1 −0 .swiftlint.yml
+12 −0 CHANGELOG.md
+44 −1 Package.swift
+93 −33 README.md
+1 −1 Rakefile
+1 −1 SWXMLHash.podspec
+1 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash OSX.xcscheme
+1 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash iOS.xcscheme
+1 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash tvOS.xcscheme
+1 −1 SWXMLHash.xcodeproj/xcshareddata/xcschemes/SWXMLHash watchOS.xcscheme
+1 −1 Source/SWXMLHash+TypeConversion.swift
+3 −3 Source/SWXMLHash.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SourceKitten
Submodule SourceKitten updated 38 files
+36 −2 .circleci/config.yml
+33 −0 CHANGELOG.md
+1 −1 Cartfile
+2 −2 Cartfile.resolved
+1 −1 Carthage/Checkouts/SWXMLHash
+1 −1 Carthage/Checkouts/Yams
+1 −1 Package.swift
+2 −2 Package@swift-4.swift
+2 −1 Source/SourceKittenFramework/File.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+15 −1 Source/SourceKittenFramework/JSONOutput.swift
+4 −0 Source/SourceKittenFramework/SourceDeclaration.swift
+24 −2 Source/SourceKittenFramework/String+SourceKitten.swift
+1 −1 Source/SourceKittenFramework/Version.swift
+1 −1 Source/sourcekitten/Info.plist
+1 −1 SourceKittenFramework.podspec
+384 −384 Tests/SourceKittenFrameworkTests/Fixtures/Bicycle@swift-3.2.json
+427 −427 Tests/SourceKittenFrameworkTests/Fixtures/BicycleIndex@swift-3.2.json
+2,678 −2,678 Tests/SourceKittenFrameworkTests/Fixtures/Commandant@swift-3.2.json
+152 −152 Tests/SourceKittenFrameworkTests/Fixtures/DocInfo@swift-3.2.json
+253 −253 Tests/SourceKittenFrameworkTests/Fixtures/Extension@swift-3.2.json
+0 −515 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle.json
+372 −372 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycle@swift-3.2.json
+289 −289 Tests/SourceKittenFrameworkTests/Fixtures/LinuxBicycleIndex@swift-3.2.json
+0 −338 Tests/SourceKittenFrameworkTests/Fixtures/LinuxExtension.json
+231 −231 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-3.2.2.json
+186 −186 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSimpleCodeCompletion@swift-3.2.json
+0 −48 Tests/SourceKittenFrameworkTests/Fixtures/LinuxSubscript.json
+157 −157 Tests/SourceKittenFrameworkTests/Fixtures/ModuleInfo@swift-3.2.json
+83 −83 Tests/SourceKittenFrameworkTests/Fixtures/Musician.json
+3,266 −3,266 Tests/SourceKittenFrameworkTests/Fixtures/Realm@swift-3.2.json
+352 −0 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-3.2.2.json
+186 −186 Tests/SourceKittenFrameworkTests/Fixtures/SimpleCodeCompletion@swift-3.2.json
+46 −46 Tests/SourceKittenFrameworkTests/Fixtures/Subscript@swift-3.2.json
+34 −34 Tests/SourceKittenFrameworkTests/Fixtures/SuperScript.json
+7 −1 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+19 −0 Tests/SourceKittenFrameworkTests/StringTests.swift
+5 −1 Tests/SourceKittenFrameworkTests/SwiftDocsTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftyTextTable
Submodule SwiftyTextTable updated 2 files
+2 −3 README.md
+21 −3 Source/SwiftyTextTable/TextTable.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Yams
Submodule Yams updated 25 files
+1 −1 .travis.yml
+1 −1 Package@swift-4.swift
+4 −9 README.md
+0 −394 Sources/CYaml/src/dumper.c
+0 −453 Sources/CYaml/src/loader.c
+153 −67 Sources/Yams/Constructor.swift
+326 −0 Sources/Yams/Decoder.swift
+96 −32 Sources/Yams/Emitter.swift
+345 −0 Sources/Yams/Encoder.swift
+1 −1 Sources/Yams/Node.Mapping.swift
+1 −1 Sources/Yams/Node.Sequence.swift
+2 −2 Sources/Yams/Parser.swift
+115 −38 Sources/Yams/Representer.swift
+84 −40 Sources/Yams/Resolver.swift
+8 −2 Tests/LinuxMain.swift
+29 −13 Tests/YamsTests/ConstructorTests.swift
+16 −1 Tests/YamsTests/EmitterTests.swift
+996 −0 Tests/YamsTests/EncoderTests.swift
+2 −2 Tests/YamsTests/PerformanceTests.swift
+38 −1 Tests/YamsTests/ResolverTests.swift
+14 −14 Tests/YamsTests/SpecTests.swift
+1 −1 Tests/YamsTests/TestHelper.swift
+1 −1 Yams.podspec
+1 −1 Yams.xcodeproj/Yams_Info.plist
+12 −8 Yams.xcodeproj/project.pbxproj
42 changes: 30 additions & 12 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,28 @@
{
"package": "Commandant",
"repositoryURL": "https://github.com/Carthage/Commandant.git",
"state": {
"branch": "master",
"revision": "3ff9019f7afd189c43a349f819684988031053a0",
"version": null
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4",
"version": "7.0.2"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "c281992c31c3f41c48b5036c5a38185eaec32626",
"version": "0.12.0"
"revision": "0ff81f2c665b4381f526bd656f8708dd52a9ea2f",
"version": "1.2.0"
}
},
{
Expand All @@ -33,8 +51,8 @@
"repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
"state": {
"branch": null,
"revision": "49dee5d3c448685ca3f511792f5b679423d36475",
"version": "4.2.3"
"revision": "12496b370363034ccc919e1d72a99b9970b4941e",
"version": "4.2.5"
}
},
{
Expand All @@ -51,26 +69,26 @@
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
"state": {
"branch": null,
"revision": "18e391d9b1ed5032d401015740f3c19e7937e279",
"version": "0.18.2"
"revision": "71e8297e5d95118588f8aa8e1de892762346dc9d",
"version": "0.18.4"
}
},
{
"package": "SwiftyTextTable",
"repositoryURL": "https://github.com/scottrhoyt/SwiftyTextTable.git",
"repositoryURL": "https://github.com/jpsim/SwiftyTextTable.git",
"state": {
"branch": null,
"revision": "a8b8f754f610f2e40a22f59f74909ea4e01630af",
"version": "0.7.0"
"branch": "characters",
"revision": "fb31390e74392773d0f587a3b1481ee65056e075",
"version": null
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "05921531200acff0d8d9caab5ec77b2bcf300b6b",
"version": "0.3.7"
"revision": "90a76f3cdb552b8e6aea5dabdd6c3578b8a7ad45",
"version": "0.4.1"
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ let package = Package(
.library(name: "SwiftLintFramework", targets: ["SwiftLintFramework"])
],
dependencies: [
.package(url: "https://github.com/Carthage/Commandant.git", from: "0.12.0"),
.package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.18.2"),
.package(url: "https://github.com/jpsim/Yams.git", from: "0.3.7"),
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.7.0"),
.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/jpsim/SwiftyTextTable.git", .branch("characters")),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion SwiftLintFramework.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Pod::Spec.new do |s|
s.source_files = 'Source/SwiftLintFramework/**/*.swift'
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
s.dependency 'SourceKittenFramework', '~> 0.18'
s.dependency 'Yams', '~> 0.3'
s.dependency 'Yams', '~> 0.4'
end

0 comments on commit 258ed9c

Please sign in to comment.