Skip to content

Commit

Permalink
Merge pull request #64 from uphold/support/swift4
Browse files Browse the repository at this point in the history
Add support to Xcode 9
  • Loading branch information
digobaptista authored Dec 6, 2017
2 parents a5a11be + ddd9326 commit 42598c9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c

osx_image: xcode8.3
osx_image: xcode9.1

env:
- SCHEME=UpholdSdk
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Hearst-DD/ObjectMapper" ~> 2.2.8
github "mxcl/OMGHTTPURLRQ" ~> 3.2.2
github "mxcl/PromiseKit" ~> 4.1.8
github "marketplacer/keychain-swift" ~> 7.0.1
github "marketplacer/keychain-swift" ~> 8.0.0
github "theadam/SwiftClient" ~> 3.0.3
12 changes: 6 additions & 6 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "vadymmarkov/Fakery" "2.0.0"
github "Hearst-DD/ObjectMapper" "2.2.9"
github "kylef/URITemplate.swift" "2.0.3"
github "marketplacer/keychain-swift" "8.0.3"
github "mxcl/OMGHTTPURLRQ" "3.2.2"
github "Hearst-DD/ObjectMapper" "2.2.8"
github "mxcl/PromiseKit" "4.4.1"
github "mxcl/PromiseKit" "4.5.0"
github "theadam/SwiftClient" "3.0.3"
github "kylef/URITemplate.swift" "2.0.1"
github "marketplacer/keychain-swift" "7.0.1"
github "uphold-forks/Mockingjay" "40275c6b531fb9514327d9ce09e0acf9128a774c"
github "uphold-forks/Mockingjay" "5da8570964ee57f00c0a31aef4128fa40f735754"
github "vadymmarkov/Fakery" "2.1.0"
6 changes: 3 additions & 3 deletions UpholdSdk.podspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
],
"dependencies": {
"KeychainSwift": [
"7.0.1"
"8.0.3"
],
"ObjectMapper": [
"2.2.8"
"2.2.9"
],
"PromiseKit": [
"4.1.8"
"4.5.0"
],
"SwiftClient": [
"3.0.1"
Expand Down

0 comments on commit 42598c9

Please sign in to comment.