Skip to content

Commit

Permalink
Merge pull request realm#952 from realm/jp-bump-dependencies
Browse files Browse the repository at this point in the history 
bump dependencies
  • Loading branch information
@jpsim
jpsim authored Dec 19, 2016
2 parents a58419c + 1654561 commit ccf8441
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 20 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "jpsim/SourceKitten" "master"
github "jpsim/SourceKitten" ~> 0.16.0
github "scottrhoyt/SwiftyTextTable" ~> 0.5.0
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" ~> 0.11
github "jspahrsummers/xcconfigs" "master"
github "behrang/YamlSwift" ~> 3.0
github "behrang/YamlSwift" ~> 3.3
13 changes: 7 additions & 6 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Commandant
Submodule Commandant updated 11 files
+10 −0 .Package.test.swift
+5 −2 .travis.yml
+2 −2 Cartfile.private
+2 −2 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+3 −13 Package.swift
+11 −0 Sources/Commandant/Command.swift
+12 −0 Sources/Commandant/Errors.swift
+1 −1 Sources/Commandant/Info.plist
+1 −1 Tests/CommandantTests/Info.plist
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Submodule Result updated 9 files
+1 −1 .swift-version
+38 −15 README.md
+1 −1 Result.podspec
+2 −0 Result.xcodeproj/project.pbxproj
+1 −1 Result/Info.plist
+54 −9 Result/Result.swift
+1 −0 Tests/LinuxMain.swift
+1 −1 Tests/ResultTests/Info.plist
+46 −44 Tests/ResultTests/ResultTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SWXMLHash
Submodule SWXMLHash updated 6 files
+1 −1 .swift-version
+6 −1 CHANGELOG.md
+7 −7 README.md
+4 −1 SWXMLHash.podspec
+6 −0 SWXMLHash.xcodeproj/project.pbxproj
+4 −4 Source/SWXMLHash.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SourceKitten
Submodule SourceKitten updated 47 files
+1 −0 .gitignore
+3 −3 .gitmodules
+2 −3 .travis.yml
+72 −0 CHANGELOG.md
+1 −1 Cartfile
+4 −4 Cartfile.resolved
+1 −1 Carthage/Checkouts/Result
+1 −1 Carthage/Checkouts/SWXMLHash
+0 −1 Carthage/Checkouts/YamlSwift
+1 −0 Carthage/Checkouts/Yams
+1 −1 Carthage/Checkouts/xcconfigs
+25 −3 Makefile
+2 −2 Package.swift
+28 −0 README.md
+5 −10 Releasing.md
+12 −22 Source/SourceKittenFramework/Clang+SourceKitten.swift
+1 −0 Source/SourceKittenFramework/ClangTranslationUnit.swift
+1 −1 Source/SourceKittenFramework/Dictionary+Merge.swift
+1 −1 Source/SourceKittenFramework/File.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+3 −1 Source/SourceKittenFramework/JSONOutput.swift
+41 −14 Source/SourceKittenFramework/Module.swift
+6 −2 Source/SourceKittenFramework/Request.swift
+16 −2 Source/SourceKittenFramework/SourceDeclaration.swift
+2 −2 Source/SourceKittenFramework/SourceLocation.swift
+2 −2 Source/SourceKittenFramework/String+SourceKitten.swift
+1 −1 Source/SourceKittenFramework/Structure.swift
+0 −1 Source/SourceKittenFramework/SwiftDocKey.swift
+1 −1 Source/SourceKittenFramework/SyntaxMap.swift
+1 −1 Source/SourceKittenFramework/SyntaxToken.swift
+4 −4 Source/SourceKittenFramework/library_wrapper.swift
+3 −3 Source/SourceKittenFramework/library_wrapper_sourcekitd.swift
+1 −1 Source/sourcekitten/Components.plist
+1 −1 Source/sourcekitten/DocCommand.swift
+1 −1 Source/sourcekitten/Info.plist
+3 −1 Source/sourcekitten/VersionCommand.swift
+47 −0 Source/sourcekitten/YamlRequestCommand.swift
+1 −0 Source/sourcekitten/main.swift
+0 −14 SourceKitten.podspec
+1 −1 SourceKitten.xcworkspace/contents.xcworkspacedata
+14 −0 SourceKittenFramework.podspec
+3 −0 Tests/SourceKittenFrameworkTests/Fixtures/CommandantSPM.json
+342 −34 Tests/SourceKittenFrameworkTests/Fixtures/Realm.json
+0 −2 Tests/SourceKittenFrameworkTests/ModuleTests.swift
+10 −0 Tests/SourceKittenFrameworkTests/SourceKitTests.swift
+1 −1 Tests/SourceKittenFrameworkTests/StringTests.swift
+22 −22 sourcekitten.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion Carthage/Checkouts/YamlSwift
Submodule YamlSwift updated 2 files
+5 −2 Yaml.podspec
+8 −0 Yaml.xcodeproj/project.pbxproj
1 change: 1 addition & 0 deletions Carthage/Checkouts/Yams
Submodule Yams added at b64e0a
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Submodule xcconfigs updated from cc451b to 2055f1
2 changes: 1 addition & 1 deletion Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]
Expand Down
12 changes: 8 additions & 4 deletions SwiftLint.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
E89376AD1B8A701E0025708E /* Yaml.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E89376AC1B8A701E0025708E /* Yaml.framework */; };
E8B067811C13E49600E9E13F /* Configuration+CommandLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B067801C13E49600E9E13F /* Configuration+CommandLine.swift */; };
E8B67C3E1C095E6300FDED8E /* Correction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8B67C3D1C095E6300FDED8E /* Correction.swift */; };
E8BE1FCC1E07687400F781C7 /* Yams.framework in Embed Frameworks into SwiftLintFramework.framework */ = {isa = PBXBuildFile; fileRef = E8BE1FCB1E07687400F781C7 /* Yams.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8C0DFCD1AD349DB007EE3D4 /* SWXMLHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8C0DFCC1AD349DB007EE3D4 /* SWXMLHash.framework */; };
E8EA41171C2D1DBE004F9930 /* CheckstyleReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8EA41161C2D1DBE004F9930 /* CheckstyleReporter.swift */; };
F22314B01D4FA4D7009AD165 /* LegacyNSGeometryFunctionsRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = F22314AE1D4F7C77009AD165 /* LegacyNSGeometryFunctionsRule.swift */; };
Expand Down Expand Up @@ -204,6 +205,7 @@
6CCFCF2D1CFEF731003239EB /* SourceKittenFramework.framework in Embed Frameworks into SwiftLintFramework.framework */,
6CCFCF2E1CFEF73A003239EB /* SWXMLHash.framework in Embed Frameworks into SwiftLintFramework.framework */,
6CCFCF2F1CFEF73E003239EB /* SwiftyTextTable.framework in Embed Frameworks into SwiftLintFramework.framework */,
E8BE1FCC1E07687400F781C7 /* Yams.framework in Embed Frameworks into SwiftLintFramework.framework */,
);
name = "Embed Frameworks into SwiftLintFramework.framework";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -401,6 +403,7 @@
E8BA7E101B07A3EC003E02D0 /* Commandant.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Commandant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E8BA7E121B07A3F3003E02D0 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E8BB8F9B1B17DE3B00199606 /* RulesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulesTests.swift; sourceTree = "<group>"; };
E8BE1FCB1E07687400F781C7 /* Yams.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Yams.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E8C0DFCC1AD349DB007EE3D4 /* SWXMLHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SWXMLHash.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E8EA41161C2D1DBE004F9930 /* CheckstyleReporter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckstyleReporter.swift; sourceTree = "<group>"; };
F22314AE1D4F7C77009AD165 /* LegacyNSGeometryFunctionsRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacyNSGeometryFunctionsRule.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -616,13 +619,14 @@
D0D1216F19E87B05005E4BAA /* Supporting Files */ = {
isa = PBXGroup;
children = (
3BBF2F9C1C640A0F006CD775 /* SwiftyTextTable.framework */,
D0D1217019E87B05005E4BAA /* Info.plist */,
E8C0DFCC1AD349DB007EE3D4 /* SWXMLHash.framework */,
E876BFBD1B07828500114ED5 /* SourceKittenFramework.framework */,
E89376AC1B8A701E0025708E /* Yaml.framework */,
E8AB1A2D1A649F2100452012 /* libclang.dylib */,
E868473B1A587C6E0043DC65 /* sourcekitd.framework */,
E876BFBD1B07828500114ED5 /* SourceKittenFramework.framework */,
3BBF2F9C1C640A0F006CD775 /* SwiftyTextTable.framework */,
E8C0DFCC1AD349DB007EE3D4 /* SWXMLHash.framework */,
E89376AC1B8A701E0025708E /* Yaml.framework */,
E8BE1FCB1E07687400F781C7 /* Yams.framework */,
);
path = "Supporting Files";
sourceTree = "<group>";
Expand Down
3 changes: 3 additions & 0 deletions SwiftLint.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion SwiftLintFramework.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ Pod::Spec.new do |s|
s.platform = :osx, '10.10'
s.source_files = 'Source/SwiftLintFramework/**/*.swift'
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
s.dependency 'SourceKitten'
s.dependency 'SourceKittenFramework'
s.dependency 'Yaml'
end

0 comments on commit ccf8441

Please sign in to comment.