diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 89 | ||||
| -rwxr-xr-x | test.sh | 9 |
4 files changed, 99 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index dac7676..22b130c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ cache: rvm: 2.3.1 before_install: - - gem uninstall cocoapods -a - - gem install cocoapods -v 1.3.1 # Since Travis is not always on latest version + - open -a "simulator" --args -CurrentDeviceUDID ABBD7191-486B-462F-80B4-AE08C5820DA1 + - bundle install - gem install xcpretty - - pod install --project-directory=Example --repo-update + - bundle exec pod install --project-directory=Example --repo-update script: - "! git grep ' $'" # Fail on trailing whitespace @@ -0,0 +1,6 @@ +# use 'bundle update' to update to latest gems +source 'https://rubygems.org' + +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git' +gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git' +gem 'xcodeproj', :git => 'https://github.com/CocoaPods/Xcodeproj.git' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..6c8522e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,89 @@ +GIT + remote: https://github.com/CocoaPods/CocoaPods.git + revision: a75a2e85e262c3c38d1a2fa9e0f5de01cc6a3368 + specs: + cocoapods (1.3.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) + 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.2.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.6.1) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.1, < 2.0) + +GIT + remote: https://github.com/CocoaPods/Core.git + revision: 77f5b2081bf347db73e5978737633e1943dc5f29 + specs: + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + +GIT + remote: https://github.com/CocoaPods/Xcodeproj.git + revision: 8c5090295a9c871f55aa0beaf9440b06ad0d8d04 + specs: + xcodeproj (1.5.1) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + activesupport (4.2.9) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.2) + 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.2.0) + nap (>= 0.8, < 2.0) + netrc (= 0.7.8) + cocoapods-try (1.1.0) + colored2 (3.1.2) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.8.6) + minitest (5.10.3) + molinillo (0.6.3) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.7.8) + ruby-macho (1.1.0) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods! + cocoapods-core! + xcodeproj! + +BUNDLED WITH + 1.15.1 @@ -18,7 +18,7 @@ test_iOS() { -workspace Example/Firebase.xcworkspace \ -scheme AllUnitTests_iOS \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 7' \ + -destination 'platform=iOS Simulator,OS=10.3.1,name=iPhone 7' \ build \ test \ ONLY_ACTIVE_ARCH=YES \ @@ -41,13 +41,6 @@ test_macOS() { test_iOS; RESULT=$? -if [ $RESULT == 65 ]; then - echo "xcodebuild exited with 65, retrying" - sleep 5 - - test_iOS; RESULT=$? -fi - if [ $RESULT != 0 ]; then exit $RESULT; fi test_macOS; RESULT=$? |