From 1779bcc9bfef8cdc72c7ffed01439bc61a8ec788 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Wed, 6 Nov 2019 09:22:33 +0900
Subject: [PATCH 1/9] Use Xcode 10.2 in Travis for Swift 4.2 and 5 support

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9327854..4e05118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode9.3
+osx_image: xcode10.2
 language: objective-c
 cache:
 - cocoapods

From 6412421bd459587df00ea8f3e7e91978dfba55d2 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Wed, 6 Nov 2019 09:36:02 +0900
Subject: [PATCH 2/9] Specify RxCocoa to 4.x for tests

---
 test/change_podfile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"
 """), 
 """

From 751959d9a741c7cbfb683c29d14721f60be8f656 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Wed, 6 Nov 2019 10:19:33 +0900
Subject: [PATCH 3/9] Remove version restriction on Bundler 1.x

---
 cocoapods-binary.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 148b9fb83e0891130b4e281028333ccda2f26b4d Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 08:42:19 +0900
Subject: [PATCH 4/9] Set gemfile in Travis to test/Gemfile

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4e05118..dc9743d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: objective-c
 cache:
 - cocoapods
 - bundler
+gemfile: test/Gemfile
 before_install:
 - gem install cocoapods
 script:

From 4887114163bf967fa73272de48ed91bb6420ec15 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 08:43:30 +0900
Subject: [PATCH 5/9] Remove extraneous gem install cocoapods

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc9743d..9b60d5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ cache:
 - cocoapods
 - bundler
 gemfile: test/Gemfile
-before_install:
-- gem install cocoapods
 script:
 - rake install
 - cd test

From e7febad2300f38eb9acc55eab12969767324e2f5 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 08:44:04 +0900
Subject: [PATCH 6/9] Add pod setup to travis script

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9b60d5f..decdf6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ cache:
 - cocoapods
 - bundler
 gemfile: test/Gemfile
+install:
+- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+- bundle exec pod setup
 script:
 - rake install
 - cd test

From b1b5d501030acec49492cc7cd1ce2561f4972325 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 11:00:58 +0900
Subject: [PATCH 7/9] Enable command output in test script

---
 test/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.sh b/test/test.sh
index 4aa46dc..99e6466 100644
--- 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 

From 13225c2854df74a8993463cdcbbe05f35e91ed02 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 11:02:28 +0900
Subject: [PATCH 8/9] Make test.sh file executable

---
 test/test.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 test/test.sh

diff --git a/test/test.sh b/test/test.sh
old mode 100644
new mode 100755

From 3290f934d3c268a6940fa56f974e2785c14ea3f1 Mon Sep 17 00:00:00 2001
From: Kyle Fleming <kyle@kylefleming.net>
Date: Thu, 7 Nov 2019 11:39:56 +0900
Subject: [PATCH 9/9] Unset CPATH env variable in Travis

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index decdf6a..59e818b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ cache:
 - cocoapods
 - bundler
 gemfile: test/Gemfile
+before_install:
+- unset CPATH
 install:
 - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 - bundle exec pod setup