Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -5,9 +5,7 @@ android:
   components:
   - tools
   - platform-tools
-  - tools
-  - android-25
-  - sys-img-arm64-v8a-google_apis-25
+  - android-26
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
@@ -21,21 +19,19 @@ licenses:
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
 before_script:
+  - sudo apt install -y ninja-build
+  - curl -s "https://cmake.org/files/v3.15/cmake-3.15.4-Linux-x86_64.tar.gz" | sudo tar --strip-components=1 -xz -C /usr/local
+  - echo "cmake.dir=/usr/local" | tee -a local.properties
   - sudo chmod +x gradlew
   - git clone https://github.com/rafal1137/NDK_ETL.git
   - mv NDK_ETL $HOME
   - export ANDROID_NDK_HOME=$HOME/NDK_ETL/ndk-bundle
   - chmod -R 775 $HOME/NDK_ETL/ndk-bundle
-  - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
 before_install:
-  - echo y | sdkmanager "cmake;3.10.2.4988404"
-  # Emulator Management: Create, Start and Wait
-  - echo no | android create avd --force -n test -t android-25 --abi google_apis/arm64-v8a
-  - emulator -avd test -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - echo yes | sdkmanager --update
+  - echo yes | sdkmanager "platform-tools" "platforms;android-26" "build-tools;28.0.3" "tools" "system-images;android-S;google_apis_playstore;arm64-v8a"
 script:
   - ./gradlew assembleDebug
-after_script:
-  # now run the tests
-  - ./gradlew connectedAndroidTest