diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2016-05-04 11:55:43 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2016-05-04 11:55:43 -0400 |
commit | 858e8fed51710da26eb84c46863f9969407f27d2 (patch) | |
tree | b50e482a064b9a13dabc0173dee2ee3400b0cff6 | |
parent | 71fabe210739dc90d5400a2624c18af14762e2a0 (diff) | |
parent | 53a84c27178e06ad37265c428dc29504ea2810c5 (diff) | |
download | sdl_ios-858e8fed51710da26eb84c46863f9969407f27d2.tar.gz |
Merge branch 'master' into develop
-rw-r--r-- | SmartDeviceLink-iOS/Cartfile.private | 6 | ||||
-rw-r--r-- | SmartDeviceLink-iOS/Cartfile.resolved | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/SmartDeviceLink-iOS/Cartfile.private b/SmartDeviceLink-iOS/Cartfile.private index 62de95756..3431c663e 100644 --- a/SmartDeviceLink-iOS/Cartfile.private +++ b/SmartDeviceLink-iOS/Cartfile.private @@ -1,4 +1,4 @@ github "Quick/Quick" ~> 0.9 -github "Quick/Nimble" ~> 3.1 -github "AliSoftware/OHHTTPStubs" ~> 4.7 -github "erikdoe/ocmock" ~> 3.2 +github "Quick/Nimble" ~> 4.0 +github "AliSoftware/OHHTTPStubs" ~> 5.0 +github "erikdoe/ocmock" ~> 3.3 diff --git a/SmartDeviceLink-iOS/Cartfile.resolved b/SmartDeviceLink-iOS/Cartfile.resolved index dc517c275..b4e50e149 100644 --- a/SmartDeviceLink-iOS/Cartfile.resolved +++ b/SmartDeviceLink-iOS/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v3.1.0" -github "AliSoftware/OHHTTPStubs" "4.8.0" -github "Quick/Quick" "v0.9.1" -github "erikdoe/ocmock" "v3.2.2" +github "Quick/Nimble" "v4.0.1" +github "AliSoftware/OHHTTPStubs" "5.0.0" +github "Quick/Quick" "v0.9.2" +github "erikdoe/ocmock" "v3.3" |