kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 06:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1175 Use new lib with v7a support, re-enable emulator for instrumented tests

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-06-13 13:58:06 +01:00
parent 019af7be33
commit 38020ed874
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@ -6,8 +6,8 @@ sudo: required
env: env:
global: global:
# - ANDROID_TARGET=android-24 - ANDROID_TARGET=android-22
# - ANDROID_ABI=arm64-v8a - ANDROID_ABI=armeabi-v7a
before_install: before_install:
- openssl aes-256-cbc -K $encrypted_82adfa9c3806_key -iv $encrypted_82adfa9c3806_iv -in secrets.tar.enc -out secrets.tar -d - openssl aes-256-cbc -K $encrypted_82adfa9c3806_key -iv $encrypted_82adfa9c3806_iv -in secrets.tar.enc -out secrets.tar -d
@ -39,21 +39,21 @@ android:
- build-tools-28.0.3 - build-tools-28.0.3
- android-27 - android-27
- extra-android-m2repository - extra-android-m2repository
# - $ANDROID_TARGET - $ANDROID_TARGET
# - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
licenses: licenses:
- ".+" - ".+"
script: script:
- ./gradlew lintKiwixDebug jacocoTestKiwixDebugUnitTestReport - ./gradlew lintKiwixDebug jacocoTestKiwixDebugUnitTestReport
# - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M
# - emulator -avd test -no-window & - emulator -avd test -no-window &
# - android-wait-for-emulator - android-wait-for-emulator
# - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
# - adb shell input keyevent 82 & # unlock screen by pressing menu button - adb shell input keyevent 82 & # unlock screen by pressing menu button
# - adb -e logcat *:D > logcat.log & - adb -e logcat *:D > logcat.log &
# - ./gradlew createKiwixDebugCoverageReport - ./gradlew createKiwixDebugCoverageReport
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
@ -71,7 +71,7 @@ before_deploy:
deploy: deploy:
#publish on github releases #publish on github releases
- provider: releases - provider: releases
api_key: "$GITHUB_TOKEN" api_key: "$GITHUB_TOKEN"
file: app/build/outputs/apk/kiwix/release/* file: app/build/outputs/apk/kiwix/release/*
@ -84,7 +84,7 @@ deploy:
tags: true tags: true
condition: $TRAVIS_BRANCH =~ ^release|master condition: $TRAVIS_BRANCH =~ ^release|master
#publish on play store #publish on play store
- provider: script - provider: script
skip_cleanup: true skip_cleanup: true
script: ./gradlew publishKiwixRelease script: ./gradlew publishKiwixRelease

2
app/build.gradle
View File

@ -41,7 +41,7 @@ dependencies {
// Get kiwixlib online if it is not populated locally // Get kiwixlib online if it is not populated locally
if (file("../kiwixlib/src/main").list().length == 1) { if (file("../kiwixlib/src/main").list().length == 1) {
implementation 'org.kiwix.kiwixlib:kiwixlib:1.0.11' implementation 'org.kiwix.kiwixlib:kiwixlib:1.0.12'
} else { } else {
implementation project(':kiwixlib') implementation project(':kiwixlib')
archs = file("../kiwixlib/src/main/jniLibs").list() archs = file("../kiwixlib/src/main/jniLibs").list()