[pull] master from DSAppTeam:master

.gitignore

@@ -1,10 +1,8 @@
 *.iml
 .gradle
 /local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
 .DS_Store
+.idea
 /build
 /captures
 .externalNativeBuild

.travis.yml

@@ -1,30 +1,43 @@
 language: android
-android:
-  components:
-    # Uncomment the lines below if you want to
-    # use the latest revision of Android SDK Tools
-    # - tools
-    # - platform-tools
-
-    # The BuildTools version used by your project
-    - build-tools-27.0.3
+dist : trusty
+sudo: required
+jdk: oraclejdk8
 
-    # The SDK version used to compile your project
-    - android-27
+env:
+  global:
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.1
+    - ANDROID_ABI=armeabi-v7a
 
-    # Additional components
-    - extra-google-google_play_services
-    - extra-google-m2repository
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
     - extra-android-m2repository
-    - addon-google_apis-google-26
-
-
   licenses:
     - 'android-sdk-preview-license-52d11cd2'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
 
-    # Specify at least one system image,
-    # if you need to run emulator(s) during your tests
-#    - sys-img-armeabi-v7a-android-26
-#    - sys-img-armeabi-v7a-android-17
+before_install:
+  - touch $HOME/.android/repositories.cfg
+  - yes | sdkmanager "platforms;android-29"
+  - yes | sdkmanager "build-tools;29.0.1"
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
+
+before_script:
+  - chmod +x gradlew
+
+script:
+  - ./gradlew clean build
+  - ./gradlew test