From 38020ed874e93c74324277a564e28bc68d31682b Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Thu, 13 Jun 2019 13:58:06 +0100
Subject: [PATCH] #1175 Use new lib with v7a support, re-enable emulator for
 instrumented tests

---
 .travis.yml      | 26 +++++++++++++-------------
 app/build.gradle |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8341a4f76..7135f8369 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ sudo: required
 
 env:
   global:
-#    - ANDROID_TARGET=android-24
-#    - ANDROID_ABI=arm64-v8a
+    - ANDROID_TARGET=android-22
+    - ANDROID_ABI=armeabi-v7a
 
 before_install:
   - 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
     - android-27
     - extra-android-m2repository
-#    - $ANDROID_TARGET
-#    - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
+    - $ANDROID_TARGET
+    - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
 
 licenses:
   - ".+"
 
 script:
   - ./gradlew lintKiwixDebug jacocoTestKiwixDebugUnitTestReport
-  #  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M
-  #  - emulator -avd test -no-window &
-  #  - android-wait-for-emulator
-  #  - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
-  #  - adb shell input keyevent 82 & # unlock screen by pressing menu button
-  #  - adb -e logcat *:D > logcat.log &
-  #  - ./gradlew createKiwixDebugCoverageReport
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M
+  - emulator -avd test -no-window &
+  - android-wait-for-emulator
+  - adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
+  - adb shell input keyevent 82 & # unlock screen by pressing menu button
+  - adb -e logcat *:D > logcat.log &
+  - ./gradlew createKiwixDebugCoverageReport
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
@@ -71,7 +71,7 @@ before_deploy:
 
 deploy:
 
-#publish on github releases
+  #publish on github releases
   - provider: releases
     api_key: "$GITHUB_TOKEN"
     file: app/build/outputs/apk/kiwix/release/*
@@ -84,7 +84,7 @@ deploy:
       tags: true
       condition:  $TRAVIS_BRANCH =~ ^release|master
 
-#publish on play store
+  #publish on play store
   - provider: script
     skip_cleanup: true
     script: ./gradlew publishKiwixRelease
diff --git a/app/build.gradle b/app/build.gradle
index c894897e5..034ff35d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 
   // Get kiwixlib online if it is not populated locally
   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 {
     implementation project(':kiwixlib')
     archs = file("../kiwixlib/src/main/jniLibs").list()