From 8b20c30a92b0bfc3eab89d7067f6e8c3207e6329 Mon Sep 17 00:00:00 2001 From: Tom Kemp Date: Fri, 17 Jan 2020 15:12:55 +0000 Subject: [PATCH 1/3] Update Xcode and simulator versions --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aeb32b05..eb1f2d94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8.1 +osx_image: xcode11.3 sudo: false before_install: - gem install xcpretty @@ -11,9 +11,9 @@ install: - bundle install env: matrix: - - XCODE_SCHEME="libPusher" SDK="iphonesimulator" DESTINATION="OS=10.1,name=iPhone 7" + - XCODE_SCHEME="libPusher" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" - XCODE_SCHEME="libPusher-OSX" SDK="macosx" DESTINATION="arch=x86_64" - - XCODE_SCHEME="Functional Specs" SDK="iphonesimulator" DESTINATION="OS=10.1,name=iPhone 7" + - XCODE_SCHEME="Functional Specs" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" script: - set -o pipefail - rackup -p 9292 Scripts/auth_server.ru > logs.txt 2>&1 & From 1c2f6b61240fd5d32f1e4d36e52d6fef108698d0 Mon Sep 17 00:00:00 2001 From: Tom Kemp Date: Fri, 17 Jan 2020 15:14:45 +0000 Subject: [PATCH 2/3] Move constant setup to separate file --- .travis.yml | 6 ++---- Scripts/travis-set-constants.sh | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Scripts/travis-set-constants.sh diff --git a/.travis.yml b/.travis.yml index eb1f2d94..51ce6a03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,8 @@ sudo: false before_install: - gem install xcpretty install: - - tail -n +4 Sample\ iOS/Constants.h.example > Sample\ iOS/Constants.h - - echo \#define PUSHER_APP_ID @\"$(env | grep PUSHER_APP_ID | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h - - echo \#define PUSHER_API_KEY @\"$(env | grep PUSHER_API_KEY | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h - - echo \#define PUSHER_API_SECRET @\"$(env | grep PUSHER_API_SECRET | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h + - chmod u+x Scripts/travis-set-constants.sh + - Scripts/travis-set-constants.sh - bundle install env: matrix: diff --git a/Scripts/travis-set-constants.sh b/Scripts/travis-set-constants.sh new file mode 100644 index 00000000..7401ac24 --- /dev/null +++ b/Scripts/travis-set-constants.sh @@ -0,0 +1,5 @@ +#!/bin/bash +tail -n +4 Sample\ iOS/Constants.h.example > Sample\ iOS/Constants.h +echo \#define PUSHER_APP_ID @\"$(env | grep PUSHER_APP_ID | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h +echo \#define PUSHER_API_KEY @\"$(env | grep PUSHER_API_KEY | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h +echo \#define PUSHER_API_SECRET @\"$(env | grep PUSHER_API_SECRET | cut -d "=" -f 2)\" >> Sample\ iOS/Constants.h From 382864f56f342d0e0416363e2cec2f3902544890 Mon Sep 17 00:00:00 2001 From: Tom Kemp Date: Fri, 17 Jan 2020 15:16:33 +0000 Subject: [PATCH 3/3] Set macOS deployment target --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51ce6a03..eef63664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ install: - bundle install env: matrix: - - XCODE_SCHEME="libPusher" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" - - XCODE_SCHEME="libPusher-OSX" SDK="macosx" DESTINATION="arch=x86_64" - - XCODE_SCHEME="Functional Specs" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" + - XCODE_SCHEME="libPusher" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" ADDITIONAL_ARGUMENTS="" + - XCODE_SCHEME="libPusher-OSX" SDK="macosx" DESTINATION="arch=x86_64" ADDITIONAL_ARGUMENTS="MACOSX_DEPLOYMENT_TARGET=10.9" + - XCODE_SCHEME="Functional Specs" SDK="iphonesimulator" DESTINATION="OS=13.3,name=iPhone 11" ADDITIONAL_ARGUMENTS="" script: - set -o pipefail - rackup -p 9292 Scripts/auth_server.ru > logs.txt 2>&1 & - - xcodebuild -workspace libPusher.xcworkspace -scheme "$XCODE_SCHEME" -sdk "$SDK" test -destination "$DESTINATION" | xcpretty -tc + - xcodebuild -workspace libPusher.xcworkspace -scheme "$XCODE_SCHEME" -sdk "$SDK" test -destination "$DESTINATION" $ADDITIONAL_ARGUMENTS | xcpretty -tc