Skip to content

Commit

Permalink
Merge pull request #47 from uphold/support/bump-promisekit
Browse files Browse the repository at this point in the history
Bump PromiseKit
  • Loading branch information
d-moreira authored Jul 12, 2016
2 parents 51d9582 + 477ba4a commit ead49a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
github "Hearst-DD/ObjectMapper" ~> 1.2.0
github "mxcl/PromiseKit" ~> 3.1.1
github "mxcl/OMGHTTPURLRQ" ~> 3.1.2
github "mxcl/PromiseKit" ~> 3.2.1
github "marketplacer/keychain-swift" ~> 3.0.13
github "theadam/SwiftClient" ~> 2.0.3
10 changes: 5 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github "mxcl/OMGHTTPURLRQ" "3.1.1"
github "Hearst-DD/ObjectMapper" "1.2.0"
github "mxcl/OMGHTTPURLRQ" "3.1.2"
github "Hearst-DD/ObjectMapper" "1.3.0"
github "mxcl/PromiseKit" "3.2.1"
github "theadam/SwiftClient" "2.0.3"
github "SwiftyJSON/SwiftyJSON" "2.3.3"
github "kylef/URITemplate.swift" "175429f708de77e1c894e2fa4bc6c61f461822bb"
github "marketplacer/keychain-swift" "3.0.13"
github "vadymmarkov/Fakery" "1.2.0"
github "marketplacer/keychain-swift" "3.0.16"
github "vadymmarkov/Fakery" "1.3.0"
github "seegno-forks/Mockingjay" "68b619819ecee654297ff2349b934032c33581f9"
github "mxcl/PromiseKit" "3.1.1"
2 changes: 1 addition & 1 deletion UpholdSdk.podspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"1.2.0"
],
"PromiseKit": [
"3.1.1"
"3.2.1"
],
"SwiftClient": [
"2.0.3"
Expand Down

0 comments on commit ead49a8

Please sign in to comment.