From 7acdc1dd6c7af4a880f00d6670d2ee58aa52f8fa Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 8 Dec 2016 15:37:05 -0800 Subject: [PATCH] bump dependencies --- .gitmodules | 3 +++ Cartfile | 2 +- Cartfile.private | 2 +- Cartfile.resolved | 13 +++++++------ Carthage/Checkouts/Commandant | 2 +- Carthage/Checkouts/Result | 2 +- Carthage/Checkouts/SWXMLHash | 2 +- Carthage/Checkouts/SourceKitten | 2 +- Carthage/Checkouts/YamlSwift | 2 +- Carthage/Checkouts/Yams | 1 + Carthage/Checkouts/xcconfigs | 2 +- Package.swift | 2 +- SwiftLint.xcworkspace/contents.xcworkspacedata | 3 +++ 13 files changed, 23 insertions(+), 15 deletions(-) create mode 160000 Carthage/Checkouts/Yams diff --git a/.gitmodules b/.gitmodules index 969bb9934a..b5c5691df3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "Carthage/Checkouts/SwiftyTextTable"] path = Carthage/Checkouts/SwiftyTextTable url = https://github.com/scottrhoyt/SwiftyTextTable.git +[submodule "Carthage/Checkouts/Yams"] + path = Carthage/Checkouts/Yams + url = https://github.com/jpsim/Yams.git diff --git a/Cartfile b/Cartfile index 14552a0978..b9bfb6a994 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "jpsim/SourceKitten" "master" +github "jpsim/SourceKitten" ~> 0.16.0 github "scottrhoyt/SwiftyTextTable" ~> 0.5.0 diff --git a/Cartfile.private b/Cartfile.private index 1b220f2086..31b298393d 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "Carthage/Commandant" ~> 0.11 github "jspahrsummers/xcconfigs" "master" -github "behrang/YamlSwift" ~> 3.0 +github "behrang/YamlSwift" ~> 3.3 diff --git a/Cartfile.resolved b/Cartfile.resolved index 474edc9003..dd3f7cc3aa 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,7 +1,8 @@ -github "antitypical/Result" "3.0.0" -github "drmohundro/SWXMLHash" "3.0.2" +github "antitypical/Result" "3.1.0" +github "drmohundro/SWXMLHash" "3.0.3" github "scottrhoyt/SwiftyTextTable" "0.5.0" -github "behrang/YamlSwift" "3.1.0" -github "jspahrsummers/xcconfigs" "cc451b08e052b6146f5caf66bc1120420c529c7b" -github "Carthage/Commandant" "0.11.1" -github "jpsim/SourceKitten" "4e17c83ba08a07d8f992bcac67140d7b5cbb0e77" +github "behrang/YamlSwift" "3.3.1" +github "jpsim/Yams" "0.1.4" +github "jspahrsummers/xcconfigs" "2055f18efbe18e77408f7f43947f7ad92b2d4ff0" +github "Carthage/Commandant" "0.11.3" +github "jpsim/SourceKitten" "0.16.0" diff --git a/Carthage/Checkouts/Commandant b/Carthage/Checkouts/Commandant index 4e056ddcd9..ed83e4ed59 160000 --- a/Carthage/Checkouts/Commandant +++ b/Carthage/Checkouts/Commandant @@ -1 +1 @@ -Subproject commit 4e056ddcd925ec747e1540033709c3faef6d29a6 +Subproject commit ed83e4ed59943b08c24d82f6b07542e24f3d3b08 diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index df233a8d23..2dd1a0c7bc 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit df233a8d23a545153d5b5de13b1ac8db2503f088 +Subproject commit 2dd1a0c7bca4cc44082f72020fe8b14491056f88 diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash index 76b54ed835..87f2307947 160000 --- a/Carthage/Checkouts/SWXMLHash +++ b/Carthage/Checkouts/SWXMLHash @@ -1 +1 @@ -Subproject commit 76b54ed8356f8a8087b5f45fb620084f37ab6a0b +Subproject commit 87f23079471efaf3744075fdfa21bab1035d6613 diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten index 4e17c83ba0..a014d42cd5 160000 --- a/Carthage/Checkouts/SourceKitten +++ b/Carthage/Checkouts/SourceKitten @@ -1 +1 @@ -Subproject commit 4e17c83ba08a07d8f992bcac67140d7b5cbb0e77 +Subproject commit a014d42cd55beb06a157a063ed8d1e6b372a73e4 diff --git a/Carthage/Checkouts/YamlSwift b/Carthage/Checkouts/YamlSwift index 7ac41b2d63..e5ac6217e2 160000 --- a/Carthage/Checkouts/YamlSwift +++ b/Carthage/Checkouts/YamlSwift @@ -1 +1 @@ -Subproject commit 7ac41b2d63b0a959645df531ef9c4076cd4859ac +Subproject commit e5ac6217e21ba4a9c333ab5197f5c3d3165b8c1c diff --git a/Carthage/Checkouts/Yams b/Carthage/Checkouts/Yams new file mode 160000 index 0000000000..b64e0a230d --- /dev/null +++ b/Carthage/Checkouts/Yams @@ -0,0 +1 @@ +Subproject commit b64e0a230dc3c4f82cac1c8c46ae3def602131f6 diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs index cc451b08e0..2055f18efb 160000 --- a/Carthage/Checkouts/xcconfigs +++ b/Carthage/Checkouts/xcconfigs @@ -1 +1 @@ -Subproject commit cc451b08e052b6146f5caf66bc1120420c529c7b +Subproject commit 2055f18efbe18e77408f7f43947f7ad92b2d4ff0 diff --git a/Package.swift b/Package.swift index 1f5e2d3328..daaba735e5 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( ]), ], dependencies: [ - .Package(url: "https://github.com/jpsim/SourceKitten.git", majorVersion: 0, minor: 15), + .Package(url: "https://github.com/jpsim/SourceKitten.git", majorVersion: 0, minor: 16), .Package(url: "https://github.com/behrang/YamlSwift.git", majorVersion: 3), .Package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", majorVersion: 0, minor: 5), ] diff --git a/SwiftLint.xcworkspace/contents.xcworkspacedata b/SwiftLint.xcworkspace/contents.xcworkspacedata index 1930225e52..c5afadfda7 100644 --- a/SwiftLint.xcworkspace/contents.xcworkspacedata +++ b/SwiftLint.xcworkspace/contents.xcworkspacedata @@ -22,4 +22,7 @@ + +