Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travis CI fix #160

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Travis CI fix #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7399f39
Update .travis.yml
CarlosACepeda Sep 2, 2019
b3fd047
Update .travis.yml
CarlosACepeda Sep 2, 2019
3ceb613
Update .travis.yml
CarlosACepeda Sep 2, 2019
b8321ff
Update .travis.yml
CarlosACepeda Sep 2, 2019
24c20f3
Update .travis.yml
CarlosACepeda Sep 3, 2019
dfad8ff
Update build.gradle
CarlosACepeda Sep 3, 2019
b73d9ed
Merge branch 'master' into travis-ci-fix
CarlosACepeda Sep 3, 2019
f338366
Update build.gradle
CarlosACepeda Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
language: android
sudo: false
cache: false
jdk: oraclejdk7
jdk: openjdk8
env:
global:
- ANDROID_TARGET=android-23
- ANDROID_ABI=armeabi-v7a
- ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
- ACDISPLAY_USE_TEST_KEY=true

dist: trusty


android:
components:
- platform-tools
- tools
- build-tools-23.0.2
- build-tools-25.0.0
- android-23
# Extras
- extra-android-m2repository
Expand All @@ -31,7 +34,7 @@ before_script:

# Run emulator
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- emulator -avd test -no-skin -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &

Expand Down
3 changes: 2 additions & 1 deletion project/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ repositories {
}

android {
compileSdkVersion 26
compileSdkVersion 25
AChep marked this conversation as resolved.
Show resolved Hide resolved
buildToolsVersion '25.0.0'

lintOptions {
Expand Down Expand Up @@ -187,6 +187,7 @@ dependencies {

// Testing-only dependencies
//noinspection GradleDynamicVersion

androidTestCompile 'com.android.support:support-annotations:25.+'
androidTestCompile 'com.android.support.test:runner:0.4'
androidTestCompile 'com.android.support.test:rules:0.4'
Expand Down