From 8ce1403176b6d5745adf9af3763c5e7ad6609fef Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Tue, 21 Feb 2017 16:14:51 -0800 Subject: [PATCH] Xcode 8.2 on Travis --- .travis.yml | 9 ++++-- Tests/Gemfile | 3 ++ Tests/Gemfile.lock | 73 ++++++++++++++++++++++++++++++++++++++++++ Tests/Mac/Podfile.lock | 2 +- Tests/iOS/Podfile.lock | 2 +- 5 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 Tests/Gemfile create mode 100644 Tests/Gemfile.lock diff --git a/.travis.yml b/.travis.yml index de4a509f..2f151f6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode8.1 +osx_image: xcode8.2 language: objective-c before_install: @@ -8,8 +8,11 @@ before_install: - open -a "simulator" --args -CurrentDeviceUDID $IOS_SIMULATOR_UDID install: - - pod install --project-directory=./Tests/iOS - - pod install --project-directory=./Tests/Mac + - cd Tests + - bundle install + - bundle exec pod install --project-directory=./iOS + - bundle exec pod install --project-directory=./Mac + - cd ../ script: - set -o pipefail diff --git a/Tests/Gemfile b/Tests/Gemfile new file mode 100644 index 00000000..99f28f48 --- /dev/null +++ b/Tests/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "cocoapods", "~>1.2.0" diff --git a/Tests/Gemfile.lock b/Tests/Gemfile.lock new file mode 100644 index 00000000..437cab4d --- /dev/null +++ b/Tests/Gemfile.lock @@ -0,0 +1,73 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + activesupport (4.2.8) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.1) + cocoapods (1.2.0) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.1, < 2.0) + cocoapods-core (= 1.2.0) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.1.2, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored (~> 1.2) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.5) + nap (~> 1.0) + ruby-macho (~> 0.2.5) + xcodeproj (>= 1.4.1, < 2.0) + cocoapods-core (1.2.0) + activesupport (>= 4.0.2, < 5) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.1.2) + nap (>= 0.8, < 2.0) + netrc (= 0.7.8) + cocoapods-try (1.1.0) + colored (1.2) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.8.0) + minitest (5.10.1) + molinillo (0.5.6) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.7.8) + ruby-macho (0.2.6) + thread_safe (0.3.5) + tzinfo (1.2.2) + thread_safe (~> 0.1) + xcodeproj (1.4.2) + CFPropertyList (~> 2.3.3) + activesupport (>= 3) + claide (>= 1.0.1, < 2.0) + colored (~> 1.2) + nanaimo (~> 0.2.3) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (~> 1.2.0) + +BUNDLED WITH + 1.13.7 diff --git a/Tests/Mac/Podfile.lock b/Tests/Mac/Podfile.lock index 1850da06..a0703b42 100644 --- a/Tests/Mac/Podfile.lock +++ b/Tests/Mac/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: e2d5a11e69cc6a8c9e8f637d8505ac427b7b8e02 -COCOAPODS: 1.2.0.beta.1 +COCOAPODS: 1.2.0 diff --git a/Tests/iOS/Podfile.lock b/Tests/iOS/Podfile.lock index 1029fa96..2aae1df6 100644 --- a/Tests/iOS/Podfile.lock +++ b/Tests/iOS/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 7ab0033c45d6145d209ac97a4d0f7905792ec3af -COCOAPODS: 1.2.0.beta.1 +COCOAPODS: 1.2.0