From 822d322ae5cf11ef98f7cd09baa688a4616e9da2 Mon Sep 17 00:00:00 2001 From: David Merino Date: Tue, 17 Jul 2018 11:24:58 -0700 Subject: [PATCH] Fix Travis (#470) * Update travis.yml * Update demo pods. --- .travis.yml | 4 ++-- Podfile | 4 ++-- Podfile.lock | 46 +++++++++++++++++----------------------------- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index e41eab1220..335fdf65a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ cache: osx_image: xcode9.3 before_install: + - echo -e 'Host github.com\n StrictHostKeyChecking no' >> ~/.ssh/config - brew update || brew update - brew outdated xctool || brew upgrade xctool - SIMULATOR_ID=$(xcrun instruments -s | grep -o "iPhone 6 (10.1) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/") @@ -13,8 +14,7 @@ before_install: install: - bundle install - bundle exec pod repo update --silent - - rm -rf ./Pods - - yes || bundle exec pod install + - bundle exec pod install || { rm -rf ./Pods; bundle exec pod install; } script: - echo $SIMULATOR_ID diff --git a/Podfile b/Podfile index bc527fdae9..d31f19ebcb 100644 --- a/Podfile +++ b/Podfile @@ -11,12 +11,12 @@ target 'Demo' do pod 'NSURL+QueryDictionary', '~> 1.0' pod 'PureLayout' pod 'InAppSettingsKit' - pod 'iOS-Slide-Menu', :git => 'git@github.com:braintree/iOS-Slide-Menu.git', :branch => 'master' + pod 'iOS-Slide-Menu' pod 'BraintreeDropIn', :podspec => 'BraintreeDropIn.podspec' end abstract_target 'Tests' do - pod 'Specta', :git => 'git@github.com:specta/specta.git', :commit => 'f175b99aa4abeb63095d01a76bc6991c248fa877' + pod 'Specta' pod 'Expecta' pod 'OCMock' pod 'OHHTTPStubs' diff --git a/Podfile.lock b/Podfile.lock index 86b1195254..54f02c372b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,18 +1,18 @@ PODS: - - AFNetworking (3.2.0): - - AFNetworking/NSURLSession (= 3.2.0) - - AFNetworking/Reachability (= 3.2.0) - - AFNetworking/Security (= 3.2.0) - - AFNetworking/Serialization (= 3.2.0) - - AFNetworking/UIKit (= 3.2.0) - - AFNetworking/NSURLSession (3.2.0): + - AFNetworking (3.2.1): + - AFNetworking/NSURLSession (= 3.2.1) + - AFNetworking/Reachability (= 3.2.1) + - AFNetworking/Security (= 3.2.1) + - AFNetworking/Serialization (= 3.2.1) + - AFNetworking/UIKit (= 3.2.1) + - AFNetworking/NSURLSession (3.2.1): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (3.2.0) - - AFNetworking/Security (3.2.0) - - AFNetworking/Serialization (3.2.0) - - AFNetworking/UIKit (3.2.0): + - AFNetworking/Reachability (3.2.1) + - AFNetworking/Security (3.2.1) + - AFNetworking/Serialization (3.2.1) + - AFNetworking/UIKit (3.2.1): - AFNetworking/NSURLSession - BraintreeDropIn (99.99.99-github-master): - BraintreeDropIn/DropIn (= 99.99.99-github-master) @@ -25,7 +25,7 @@ PODS: - InAppSettingsKit (2.9) - iOS-Slide-Menu (1.5) - NSURL+QueryDictionary (1.2.0) - - OCMock (3.4.1) + - OCMock (3.4.2) - OHHTTPStubs (6.1.0): - OHHTTPStubs/Default (= 6.1.0) - OHHTTPStubs/Core (6.1.0) @@ -48,47 +48,35 @@ DEPENDENCIES: - CardIO - Expecta - InAppSettingsKit - - iOS-Slide-Menu (from `git@github.com:braintree/iOS-Slide-Menu.git`, branch `master`) + - iOS-Slide-Menu - NSURL+QueryDictionary (~> 1.0) - OCMock - OHHTTPStubs - PureLayout - - Specta (from `git@github.com:specta/specta.git`, commit `f175b99aa4abeb63095d01a76bc6991c248fa877`) + - Specta EXTERNAL SOURCES: BraintreeDropIn: :podspec: BraintreeDropIn.podspec - iOS-Slide-Menu: - :branch: master - :git: git@github.com:braintree/iOS-Slide-Menu.git - Specta: - :commit: f175b99aa4abeb63095d01a76bc6991c248fa877 - :git: git@github.com:specta/specta.git CHECKOUT OPTIONS: BraintreeDropIn: :commit: be09a2c76a5e8afa04ab5f0a56009ae8626204c2 :git: https://github.com/braintree/braintree-ios-drop-in.git - iOS-Slide-Menu: - :commit: 7f037450988ec3d7ac0d3e03e51073da698bf3f9 - :git: git@github.com:braintree/iOS-Slide-Menu.git - Specta: - :commit: f175b99aa4abeb63095d01a76bc6991c248fa877 - :git: git@github.com:specta/specta.git SPEC CHECKSUMS: - AFNetworking: 8ac6017b94ea105479f7776e5288e48ae9c59bb4 + AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 BraintreeDropIn: ca284a08c31fb49485883cdcfb87c69422a9b343 CardIO: 56983b39b62f495fc6dae9ad7cf875143df06443 Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 InAppSettingsKit: fc3dea21846535b76b8289b119dbfdbe2505b2b2 iOS-Slide-Menu: 40b0cbd8916c42afc755f0869793cd09e7a32102 NSURL+QueryDictionary: bae616404e2adf6409d3d5c02a093cbf44c8a236 - OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3 + OCMock: ebe9ee1dca7fbed0ff9193ac0b3e2d8862ea56f6 OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0 PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 -PODFILE CHECKSUM: 67c43bf77312c70c1a3194a0dd10b6e5f0e33d4f +PODFILE CHECKSUM: bf5132bf7aee65d6388343537dddeb48b8f89059 COCOAPODS: 1.4.0