From aaedbe2cd7f3241fd882533884b4b267c66a07a1 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 15 Mar 2019 18:33:37 +0200 Subject: [PATCH 1/2] chore: remove min/target SdkVersion from manifest run sbg tests and android tests with one command --- .travis.yml | 3 +-- .../app/src/main/AndroidManifest.xml | 14 +++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a874b6be..3f8ee34c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,7 @@ matrix: - emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window & - android-wait-for-emulator - npm install --prefix ./test-app/tools - - "./gradlew runSbgTests --stacktrace" - - "./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace" + - "./gradlew runSbgTests --stacktrace" && "./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace" - adb -e logcat -d before_install: - echo "y" | sdkmanager "cmake;3.6.4111459" diff --git a/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml b/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml index fd39a5c33..8812443e7 100644 --- a/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml +++ b/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml @@ -9,24 +9,20 @@ android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true"/> - - - + - + - - + @@ -34,7 +30,7 @@ + android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> From 00e39a1d0762978f829302e241a33d6deee918a0 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 15 Mar 2019 18:46:07 +0200 Subject: [PATCH 2/2] fix travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f8ee34c3..b4b310b12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: - emulator -avd $EMULATOR_NAME-$EMULATOR_API_LEVEL -no-skin -no-audio -no-window & - android-wait-for-emulator - npm install --prefix ./test-app/tools - - "./gradlew runSbgTests --stacktrace" && "./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace" + - "./gradlew runSbgTests --stacktrace && ./gradlew runtestsAndVerifyResults -PnoCCache --stacktrace" - adb -e logcat -d before_install: - echo "y" | sdkmanager "cmake;3.6.4111459"