diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b3f5a08a..ce2922ba3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ jobs: command: yes | sdkmanager --licenses && yes | sdkmanager --update - run: name: Setup emulator - command: sdkmanager "system-images;android-19;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-19;default;armeabi-v7a" + command: sdkmanager "system-images;android-22;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-22;default;armeabi-v7a" - run: name: Launch emulator command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -noaudio -no-boot-anim -no-window -accel on diff --git a/.travis.yml b/.travis.yml index 7a8fac277..0a95ca451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,12 @@ android: - extra-android-m2repository - addon-google_apis-google-$ANDROID_API_LEVEL # Android emulator - - android-19 - - sys-img-armeabi-v7a-android-19 + - android-22 + - sys-img-armeabi-v7a-android-22 before_script: # Launch emulator before the execution - - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a + - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & diff --git a/app/build.gradle b/app/build.gradle index 25a1cecf5..f49090242 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,6 @@ android { versionNameSuffix "-dev" testCoverageEnabled = true ext.enableCrashlytics = project.hasProperty("enableCrashlytics") - multiDexKeepProguard file('proguard-multidex-rules.pro') } } diff --git a/app/proguard-multidex-rules.pro b/app/proguard-multidex-rules.pro deleted file mode 100644 index 9ee1737f4..000000000 --- a/app/proguard-multidex-rules.pro +++ /dev/null @@ -1,3 +0,0 @@ --keep class android.support.test.internal** { *; } --keep class org.junit.** { *; } --keep public class io.github.wulkanowy** { *; }