Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ikesyo committed Jan 28, 2017
1 parent 2236d50 commit 96af5b6
Show file tree
Hide file tree
Showing 19 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/ReactiveCocoa"]
path = Carthage/Checkouts/ReactiveCocoa
url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
Expand Down Expand Up @@ -34,3 +31,6 @@
[submodule "Carthage/Checkouts/Runes"]
path = Carthage/Checkouts/Runes
url = https://github.com/thoughtbot/Runes.git
[submodule "Carthage/Checkouts/ReactiveSwift"]
path = Carthage/Checkouts/ReactiveSwift
url = https://github.com/ReactiveCocoa/ReactiveSwift.git
12 changes: 6 additions & 6 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Carthage/ReactiveTask" ~> 0.10.3
github "Carthage/Commandant" ~> 0.10.1
github "jdhealy/PrettyColors" ~> 4.0
github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2
github "mdiep/Tentacle" ~> 0.4.1
github "thoughtbot/Runes" ~> 3.2.1
github "Carthage/ReactiveTask" "96e1013e0a6782bf0faba27485fe2d0a1153b531"
github "Carthage/Commandant" ~> 0.11.2
github "jdhealy/PrettyColors" "6f54504f8715c5d51114bcff821c48fd87d8a8b7"
github "ReactiveCocoa/ReactiveSwift" ~> 1.0
github "mdiep/Tentacle" ~> 0.5
github "thoughtbot/Runes" ~> 4.0.1
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Quick" ~> 0.9.3
github "Quick/Nimble" "188caeb"
github "Quick/Quick" ~> 1.0
github "Quick/Nimble" ~> 6.0
github "jspahrsummers/xcconfigs" ~> 0.9
22 changes: 11 additions & 11 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
github "thoughtbot/Argo" "v3.1.0"
github "thoughtbot/Curry" "v2.3.3"
github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb"
github "jdhealy/PrettyColors" "v4.0.0"
github "Quick/Quick" "v0.9.3"
github "antitypical/Result" "2.1.3"
github "thoughtbot/Runes" "v3.2.1"
github "thoughtbot/Curry" "v3.0.0"
github "Quick/Nimble" "v6.0.1"
github "jdhealy/PrettyColors" "6f54504f8715c5d51114bcff821c48fd87d8a8b7"
github "Quick/Quick" "v1.0.0"
github "antitypical/Result" "3.1.0"
github "thoughtbot/Runes" "v4.0.1"
github "jspahrsummers/xcconfigs" "0.9"
github "Carthage/Commandant" "0.10.1"
github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
github "Carthage/ReactiveTask" "0.10.3"
github "mdiep/Tentacle" "0.4.1"
github "thoughtbot/Argo" "v4.1.2"
github "Carthage/Commandant" "0.11.3"
github "ReactiveCocoa/ReactiveSwift" "1.0.0"
github "Carthage/ReactiveTask" "96e1013e0a6782bf0faba27485fe2d0a1153b531"
github "mdiep/Tentacle" "0.5.0"
12 changes: 6 additions & 6 deletions Carthage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
D012AD111AF9844D00EE91DA /* Result.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D012AD0F1AF9843700EE91DA /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D01D82D71A10160700F0DD94 /* Resolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01D82D61A10160700F0DD94 /* Resolver.swift */; };
D01D82DD1A10B01D00F0DD94 /* ResolverSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01D82DC1A10B01D00F0DD94 /* ResolverSpec.swift */; };
D01F8A3F19EA28C400643E7C /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A3E19EA28C400643E7C /* ReactiveCocoa.framework */; };
D01F8A4519EA28E600643E7C /* ReactiveCocoa.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A3E19EA28C400643E7C /* ReactiveCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D01F8A3F19EA28C400643E7C /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A3E19EA28C400643E7C /* ReactiveSwift.framework */; };
D01F8A4519EA28E600643E7C /* ReactiveSwift.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A3E19EA28C400643E7C /* ReactiveSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D01F8A4A19EA28FE00643E7C /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A4719EA28F600643E7C /* Quick.framework */; };
D01F8A4C19EA28FE00643E7C /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D01F8A4B19EA28FE00643E7C /* Nimble.framework */; };
D01F8A5419EA2F1700643E7C /* Xcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01F8A5319EA2F1700643E7C /* Xcode.swift */; };
Expand Down Expand Up @@ -146,7 +146,7 @@
CD1FE6541DD367920016639E /* Runes.framework in Copy Frameworks */,
BEA86FA01C9F91500049360B /* Tentacle.framework in Copy Frameworks */,
BEA86F9F1C9F914A0049360B /* Curry.framework in Copy Frameworks */,
D01F8A4519EA28E600643E7C /* ReactiveCocoa.framework in Copy Frameworks */,
D01F8A4519EA28E600643E7C /* ReactiveSwift.framework in Copy Frameworks */,
D00CCE331A20784800109F8C /* Commandant.framework in Copy Frameworks */,
D0E0E1B11A2D28CB0097BE2B /* ReactiveTask.framework in Copy Frameworks */,
67AFA98B1A79433900B7DA78 /* PrettyColors.framework in Copy Frameworks */,
Expand Down Expand Up @@ -211,7 +211,7 @@
D012AD0F1AF9843700EE91DA /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01D82D61A10160700F0DD94 /* Resolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Resolver.swift; sourceTree = "<group>"; };
D01D82DC1A10B01D00F0DD94 /* ResolverSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResolverSpec.swift; sourceTree = "<group>"; };
D01F8A3E19EA28C400643E7C /* ReactiveCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ReactiveCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01F8A3E19EA28C400643E7C /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ReactiveSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01F8A4619EA28F600643E7C /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01F8A4719EA28F600643E7C /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D01F8A4B19EA28FE00643E7C /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -281,7 +281,7 @@
BEB076671C8A1FD800ABD373 /* Tentacle.framework in Frameworks */,
D0E0E1B01A2D28AC0097BE2B /* ReactiveTask.framework in Frameworks */,
D00CCE321A20783A00109F8C /* Commandant.framework in Frameworks */,
D01F8A3F19EA28C400643E7C /* ReactiveCocoa.framework in Frameworks */,
D01F8A3F19EA28C400643E7C /* ReactiveSwift.framework in Frameworks */,
67AFA98A1A79430B00B7DA78 /* PrettyColors.framework in Frameworks */,
D012AD101AF9843700EE91DA /* Result.framework in Frameworks */,
);
Expand Down Expand Up @@ -493,7 +493,7 @@
CD1FE6521DD366620016639E /* Runes.framework */,
D00CCE311A20783A00109F8C /* Commandant.framework */,
67AFA9891A79430B00B7DA78 /* PrettyColors.framework */,
D01F8A3E19EA28C400643E7C /* ReactiveCocoa.framework */,
D01F8A3E19EA28C400643E7C /* ReactiveSwift.framework */,
D0E0E1AF1A2D28AC0097BE2B /* ReactiveTask.framework */,
BEB076651C8A1FD800ABD373 /* Tentacle.framework */,
D0D1217019E87B05005E4BAA /* Info.plist */,
Expand Down
2 changes: 1 addition & 1 deletion Carthage.xcworkspace/contents.xcworkspacedata

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

2 changes: 1 addition & 1 deletion Carthage/Checkouts/Argo
Submodule Argo updated 111 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Curry
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 169 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 146 files
1 change: 0 additions & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa deleted from f214c9
1 change: 1 addition & 0 deletions Carthage/Checkouts/ReactiveSwift
Submodule ReactiveSwift added at 7920f1
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Tentacle
Submodule Tentacle updated 92 files
+6 −6 .gitmodules
+7 −16 .travis.yml
+3 −3 Cartfile
+0 −1 Cartfile.private
+5 −5 Cartfile.resolved
+1 −1 Carthage/Checkouts/Argo
+1 −1 Carthage/Checkouts/Curry
+0 −1 Carthage/Checkouts/OHHTTPStubs
+0 −1 Carthage/Checkouts/ReactiveCocoa
+1 −0 Carthage/Checkouts/ReactiveSwift
+1 −1 Carthage/Checkouts/Result
+1 −0 Carthage/Checkouts/Runes
+10 −5 README.md
+386 −212 Tentacle.xcodeproj/project.pbxproj
+85 −1 Tentacle.xcodeproj/xcshareddata/xcschemes/Tentacle-OSX.xcscheme
+32 −18 Tentacle.xcodeproj/xcshareddata/xcschemes/Tentacle-iOS.xcscheme
+1 −1 Tentacle.xcodeproj/xcshareddata/xcschemes/update-test-fixtures.xcscheme
+3 −3 Tentacle.xcworkspace/contents.xcworkspacedata
+70 −39 Tentacle/ArgoExtensions.swift
+42 −0 Tentacle/Author.swift
+71 −0 Tentacle/Availability.swift
+257 −206 Tentacle/Client.swift
+3 −3 Tentacle/Color.swift
+20 −17 Tentacle/Comment.swift
+106 −0 Tentacle/Commit.swift
+196 −0 Tentacle/Content.swift
+2 −2 Tentacle/Decodable.swift
+70 −0 Tentacle/File.swift
+35 −0 Tentacle/FileResponse.swift
+5 −5 Tentacle/FoundationExtensions.swift
+11 −8 Tentacle/GitHubError.swift
+42 −37 Tentacle/Issue.swift
+12 −9 Tentacle/Label.swift
+33 −27 Tentacle/Milestone.swift
+18 −19 Tentacle/PullRequest.swift
+45 −41 Tentacle/Release.swift
+17 −21 Tentacle/Repository.swift
+26 −21 Tentacle/RepositoryInfo.swift
+5 −1 Tentacle/ResourceType.swift
+30 −28 Tentacle/Response.swift
+27 −29 Tentacle/Server.swift
+32 −0 Tentacle/Sha.swift
+37 −32 Tentacle/User.swift
+44 −0 Tests/ArgoExtensionsTests.swift
+43 −50 Tests/ClientTests.swift
+18 −18 Tests/CommentsTests.swift
+85 −0 Tests/ContentTests.swift
+56 −0 Tests/FileResponseTests.swift
+62 −0 Tests/FileTests.swift
+100 −60 Tests/Fixture.swift
+45 −0 Tests/Fixtures/create-file-sample-response.data
+115 −22 Tests/Fixtures/orgs-raccommunity-repos.data
+ Tests/Fixtures/orgs-raccommunity-repos.response
+2 −2 Tests/Fixtures/repos-Carthage-Carthage-releases-tags-0.15.data
+ Tests/Fixtures/repos-Carthage-Carthage-releases-tags-0.15.response
+203 −203 Tests/Fixtures/repos-Carthage-Carthage-releases.page-1-per_page-30.data
+ Tests/Fixtures/repos-Carthage-Carthage-releases.page-1-per_page-30.response
+177 −5 Tests/Fixtures/repos-Carthage-Carthage-releases.page-2-per_page-30.data
+ Tests/Fixtures/repos-Carthage-Carthage-releases.page-2-per_page-30.response
+2 −2 Tests/Fixtures/repos-Palleas-Opensource-Sample-repository-issues-1-comments.data
+ Tests/Fixtures/repos-Palleas-Opensource-Sample-repository-issues-1-comments.response
+18 −0 Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-README.md.data
+ Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-README.md.response
+17 −0 Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-Tools-say.data
+ Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-Tools-say.response
+66 −0 Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-Tools.data
+ Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-Tools.response
+17 −0 Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-say.data
+ Tests/Fixtures/repos-Palleas-opensource-Sample-repository-contents-say.response
+10 −4 Tests/Fixtures/repos-Palleas-opensource-Sample-repository-issues.data
+ Tests/Fixtures/repos-Palleas-opensource-Sample-repository-issues.response
+1 −1 Tests/Fixtures/repos-mdiep-MDPSplitView-releases-tags-1.0.2.data
+ Tests/Fixtures/repos-mdiep-MDPSplitView-releases-tags-1.0.2.response
+17 −0 Tests/Fixtures/repos-mdiep-Tentacle-contents-Carthage-Checkouts-ReactiveSwift.data
+ Tests/Fixtures/repos-mdiep-Tentacle-contents-Carthage-Checkouts-ReactiveSwift.response
+34 −0 Tests/Fixtures/repos-mdiep-Tentacle-contents-update-test-fixtures.data
+ Tests/Fixtures/repos-mdiep-Tentacle-contents-update-test-fixtures.response
+4 −4 Tests/Fixtures/users-Palleas-Opensource-repos.data
+ Tests/Fixtures/users-Palleas-Opensource-repos.response
+3 −3 Tests/Fixtures/users-mdiep.data
+ Tests/Fixtures/users-mdiep.response
+32 −1 Tests/Fixtures/users-test.data
+ Tests/Fixtures/users-test.response
+54 −0 Tests/HTTPStub.swift
+27 −27 Tests/IssuesTests.swift
+8 −8 Tests/ReleaseTests.swift
+47 −30 Tests/RepositoryInfoTests.swift
+3 −3 Tests/ResponseTests.swift
+4 −4 Tests/ServerTests.swift
+11 −11 Tests/UserTests.swift
+1 −1 script/cibuild
+23 −30 update-test-fixtures/main.swift
2 changes: 1 addition & 1 deletion Source/carthage/Components.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<key>BundleOverwriteAction</key>
<string></string>
<key>RootRelativeBundlePath</key>
<string>Library/Frameworks/CarthageKit.framework/Versions/A/Frameworks/ReactiveCocoa.framework</string>
<string>Library/Frameworks/CarthageKit.framework/Versions/A/Frameworks/ReactiveSwift.framework</string>
</dict>
<dict>
<key>BundleOverwriteAction</key>
Expand Down

0 comments on commit 96af5b6

Please sign in to comment.