diff --git a/.travis.yml b/.travis.yml index 55031ae..cafcb48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: objective-c os: osx -osx_image: xcode9.1 +osx_image: xcode10.1 env: - TARGET_PLATFORM=android diff --git a/scripts/build-test-app.sh b/scripts/build-test-app.sh index 468bef8..e8e021a 100755 --- a/scripts/build-test-app.sh +++ b/scripts/build-test-app.sh @@ -2,6 +2,7 @@ set -e ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/.. +WORKINGCOPY=$ROOT/temp/workingcopy CDV=$ROOT/node_modules/.bin/cordova PLATFORM=ios @@ -38,7 +39,8 @@ rm -rf $ROOT/temp mkdir $ROOT/temp cp -r $ROOT/test/app-template/ $ROOT/temp/ cp $ROOT/test/app-test-definitions.js $ROOT/temp/www/ +rsync -ax --exclude node_modules --exclude scripts --exclude temp --exclude test $ROOT $WORKINGCOPY cd $ROOT/temp $CDV prepare -$CDV plugins add $ROOT -$CDV build $PLATFORM --$TARGET +$CDV plugins add $WORKINGCOPY +$CDV build $PLATFORM --$TARGET --buildConfig build.json diff --git a/test/app-mocha-specs/helpers/caps.js b/test/app-mocha-specs/helpers/caps.js index 069ddcd..c003698 100644 --- a/test/app-mocha-specs/helpers/caps.js +++ b/test/app-mocha-specs/helpers/caps.js @@ -1,7 +1,5 @@ const local = { iosDevice: { - browserName: '', - 'appium-version': '1.7.1', platformName: 'iOS', platformVersion: '10.3', deviceName: 'iPhone 6', @@ -9,8 +7,6 @@ const local = { app: undefined // will be set later }, iosEmulator: { - browserName: '', - 'appium-version': '1.7.1', platformName: 'iOS', platformVersion: '11.0', deviceName: 'iPhone Simulator', @@ -18,8 +14,6 @@ const local = { app: undefined // will be set later }, androidEmulator: { - browserName: '', - 'appium-version': '1.7.1', platformName: 'Android', platformVersion: '5.1', deviceName: 'Android Emulator', diff --git a/test/app-template/build.json b/test/app-template/build.json new file mode 100644 index 0000000..df11bd7 --- /dev/null +++ b/test/app-template/build.json @@ -0,0 +1,14 @@ +{ + "ios": { + "debug": { + "buildFlag": [ + "-UseModernBuildSystem=0" + ] + }, + "release": { + "buildFlag": [ + "-UseModernBuildSystem=0" + ] + } + } +}