Skip to content

Commit fdc39bb

Browse files
muukiikylefleming
andauthored
Fix/ci (#3)
* Use Xcode 10.2 in Travis for Swift 4.2 and 5 support * Specify RxCocoa to 4.x for tests * Remove version restriction on Bundler 1.x * Set gemfile in Travis to test/Gemfile * Remove extraneous gem install cocoapods * Add pod setup to travis script * Enable command output in test script * Make test.sh file executable * Unset CPATH env variable in Travis Co-authored-by: Kyle Fleming <[email protected]>
1 parent 596cb28 commit fdc39bb

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.travis.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
osx_image: xcode9.3
1+
osx_image: xcode10.2
22
language: objective-c
33
cache:
44
- cocoapods
55
- bundler
6+
gemfile: test/Gemfile
67
before_install:
7-
- gem install cocoapods
8+
- unset CPATH
9+
install:
10+
- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
11+
- bundle exec pod setup
812
script:
913
- rake install
1014
- cd test

cocoapods-binary.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
2222
spec.add_dependency "fourflusher", "~> 2.0"
2323
spec.add_dependency "xcpretty", "~> 0.3.0"
2424

25-
spec.add_development_dependency 'bundler', '~> 1.3'
25+
spec.add_development_dependency 'bundler', '> 1.3'
2626
spec.add_development_dependency 'rake'
2727
end

test/change_podfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def addSwiftPod():
5353
"""
5454
keep_source_code_for_prebuilt_frameworks!
5555
56-
pod "RxCocoa", :binary => true
56+
pod "RxCocoa", "~> 4.0", :binary => true
5757
pod "Literal", :binary => true
5858
"""),
5959
"""
@@ -70,7 +70,7 @@ def revertToSourceCode():
7070
"""
7171
keep_source_code_for_prebuilt_frameworks!
7272
73-
pod "RxCocoa", :binary => true
73+
pod "RxCocoa", "~> 4.0", :binary => true
7474
pod "Literal"
7575
"""),
7676
"""

test/test.sh

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
set -e
2+
set -ex
33

44
build() {
55
xcodebuild -workspace Binary.xcworkspace -scheme Binary ONLY_ACTIVE_ARCH=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -quiet || exit 1

0 commit comments

Comments
 (0)