diff --git a/.travis.yml b/.travis.yml index 9327854..59e818b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,14 @@ -osx_image: xcode9.3 +osx_image: xcode10.2 language: objective-c cache: - cocoapods - bundler +gemfile: test/Gemfile before_install: -- gem install cocoapods +- unset CPATH +install: +- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} +- bundle exec pod setup script: - rake install - cd test diff --git a/cocoapods-binary.gemspec b/cocoapods-binary.gemspec index 697aeb2..de525fb 100644 --- a/cocoapods-binary.gemspec +++ b/cocoapods-binary.gemspec @@ -22,6 +22,6 @@ Gem::Specification.new do |spec| spec.add_dependency "fourflusher", "~> 2.0" spec.add_dependency "xcpretty", "~> 0.3.0" - spec.add_development_dependency 'bundler', '~> 1.3' + spec.add_development_dependency 'bundler', '> 1.3' spec.add_development_dependency 'rake' end diff --git a/test/change_podfile.py b/test/change_podfile.py index 5f31510..95b5098 100644 --- a/test/change_podfile.py +++ b/test/change_podfile.py @@ -53,7 +53,7 @@ def addSwiftPod(): """ keep_source_code_for_prebuilt_frameworks! -pod "RxCocoa", :binary => true +pod "RxCocoa", "~> 4.0", :binary => true pod "Literal", :binary => true """), """ @@ -70,7 +70,7 @@ def revertToSourceCode(): """ keep_source_code_for_prebuilt_frameworks! -pod "RxCocoa", :binary => true +pod "RxCocoa", "~> 4.0", :binary => true pod "Literal" """), """ diff --git a/test/test.sh b/test/test.sh old mode 100644 new mode 100755 index 4aa46dc..99e6466 --- a/test/test.sh +++ b/test/test.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -e +set -ex build() { xcodebuild -workspace Binary.xcworkspace -scheme Binary ONLY_ACTIVE_ARCH=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -quiet || exit 1