From 0169ab69b8c970cb397e4500e9d9c701eb3c9571 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Tue, 21 Apr 2020 08:46:17 +0200
Subject: [PATCH 01/16] Fix NOT PR stage condition

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9992cdc..6077814 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,9 +53,10 @@ jobs:
       if: type = pull_request
       script: ./gradlew assembleDebug
     - stage: run_ci_fastlane
+      if: (NOT type IN (pull_request))
       before_install:
         - rvm install 2.6.3
         - bundle install
         - fastlane install_plugins
       script: bundle exec fastlane testing  
-      if: type (NOT type IN (pull_request))
\ No newline at end of file
+      
\ No newline at end of file

From 5c3c9b9c815c1cec5f159e9f9396ec3941fdb107 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Tue, 21 Apr 2020 09:45:46 +0200
Subject: [PATCH 02/16] Install android sdk tools manually

---
 .travis.yml | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6077814..0a65175 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,26 +7,17 @@ git:
 before_install:
   - sudo apt-get -y install xsltproc xml-twig-tools
 
-android:
-  components:
-    # Update Android SDK tools
-    - tools
-    - platform-tools
-
-    # Build tools
-    - build-tools-29.0.3
-
-    # SDK version
-    - android-29
-
-    # Additional Google components
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-  licenses:
-    - android-sdk-preview-license-.+
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+SDKTOOLS: https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip  
+install:
+  # Download and unzip the Android SDK tools (if not already there thanks to the cache mechanism)
+  # Latest version available here: https://developer.android.com/studio/#command-tools
+  - if test ! -e $HOME/android-sdk-dl/sdk-tools.zip ; then curl $SDKTOOLS > $HOME/android-sdk-dl/sdk-tools.zip ; fi
+  - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk
+
+  # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)
+  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null
+  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;28.0.3' > /dev/null
+  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-28' > /dev/null  
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -35,13 +26,19 @@ before_cache:
 cache:
   bundler: true
   directories:
+    # Android SDK
+    - $HOME/android-sdk-dl
+    - $HOME/android-sdk
+
+    # Gradle dependencies
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-    - .gradle
+
+    # Android build cache (see http://tools.android.com/tech-docs/build-cache)
     - $HOME/.android/build-cache
-    - $HOME/.m2/repository
-    - $HOME/.sonar/cache
 
+env:
+  - ANDROID_HOME=$HOME/android-sdk
 jobs:	
   fast_finish: true
   include:

From 5f4ae83bf13c42e188e55febd3572fbe659ecb27 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Tue, 21 Apr 2020 09:50:55 +0200
Subject: [PATCH 03/16] Inline sdk url

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a65175..04e70c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,10 @@ git:
 before_install:
   - sudo apt-get -y install xsltproc xml-twig-tools
 
-SDKTOOLS: https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip  
 install:
   # Download and unzip the Android SDK tools (if not already there thanks to the cache mechanism)
   # Latest version available here: https://developer.android.com/studio/#command-tools
-  - if test ! -e $HOME/android-sdk-dl/sdk-tools.zip ; then curl $SDKTOOLS > $HOME/android-sdk-dl/sdk-tools.zip ; fi
+  - if test ! -e $HOME/android-sdk-dl/sdk-tools.zip ; then curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip > $HOME/android-sdk-dl/sdk-tools.zip ; fi
   - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk
 
   # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)

From 438d4009ee75d7d35254a2560242e10cb0124751 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Tue, 21 Apr 2020 09:54:10 +0200
Subject: [PATCH 04/16] Restore Travis Android tools and use the default one

---
 .travis.yml | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04e70c9..e9a287b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,26 @@ git:
 before_install:
   - sudo apt-get -y install xsltproc xml-twig-tools
 
-install:
-  # Download and unzip the Android SDK tools (if not already there thanks to the cache mechanism)
-  # Latest version available here: https://developer.android.com/studio/#command-tools
-  - if test ! -e $HOME/android-sdk-dl/sdk-tools.zip ; then curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip > $HOME/android-sdk-dl/sdk-tools.zip ; fi
-  - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk
-
-  # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;28.0.3' > /dev/null
-  - echo y | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-28' > /dev/null  
+android:
+  components:
+    # Update Android SDK tools
+    - tools
+    - platform-tools
+
+    # Build tools
+    - build-tools-25.0.2
+
+    # SDK version
+    - android-29
+
+    # Additional Google components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -25,19 +35,13 @@ before_cache:
 cache:
   bundler: true
   directories:
-    # Android SDK
-    - $HOME/android-sdk-dl
-    - $HOME/android-sdk
-
-    # Gradle dependencies
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-
-    # Android build cache (see http://tools.android.com/tech-docs/build-cache)
+    - .gradle
     - $HOME/.android/build-cache
+    - $HOME/.m2/repository
+    - $HOME/.sonar/cache
 
-env:
-  - ANDROID_HOME=$HOME/android-sdk
 jobs:	
   fast_finish: true
   include:

From 00bd21b7bac2ba4d5cb87596b12befbb7cfa0b33 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sat, 25 Apr 2020 12:55:36 +0200
Subject: [PATCH 05/16] Install android tools manually

---
 .travis.yml | 57 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9a287b..a9049e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,41 @@
-dist: trusty
-language: android
+language: minimal
+os: linux
+dist: xenial
+group: edge
 
 git:
   depth: false
 
+env:
+  global:
+  # for updates check developer.android.com/studio#downloads (current 26.1.1)
+  - ANDROID_SDK_TOOLS=commandlinetools-linux-6200805_latest.zip
+
 before_install:
-  - sudo apt-get -y install xsltproc xml-twig-tools
-
-android:
-  components:
-    # Update Android SDK tools
-    - tools
-    - platform-tools
-
-    # Build tools
-    - build-tools-25.0.2
-
-    # SDK version
-    - android-29
-
-    # Additional Google components
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-  licenses:
-    - android-sdk-preview-license-.+
-    - android-sdk-license-.+
-    - google-gdk-license-.+
+  # set JAVA_HOME path
+  - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+  # download and unzip Android SDK command line tools
+  - wget -nv https://dl.google.com/android/repository/$ANDROID_SDK_TOOLS
+  - unzip -q $ANDROID_SDK_TOOLS -d $HOME/sdk
+  # set SDK tools path variable and ANDROID_HOME
+  - export PATH=$PATH:$HOME/sdk/tools/bin
+  - export ANDROID_HOME=$HOME/sdk
+  # create empty cfg file to prevent sdkmanager warning message
+  - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
+
+install:
+  # accept licenses for all available packages that have not already been accepted
+  - yes | sdkmanager --licenses >/dev/null
+
+before_script:
+  # set executable flag for gradle wrapper
+  - chmod +x gradlew
+  # create dir for gradle settings
+  - mkdir -p $HOME/.gradle
+  # disable gradle daemon for current user
+  - echo "org.gradle.daemon=false" >> $HOME/.gradle/gradle.properties
+  # set gradle log format to plain
+  - echo "org.gradle.console=plain" >> $HOME/.gradle/gradle.properties  
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

From bbc159db57cdc2eb6ad0394ecbd21a3e9a6869d3 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sat, 25 Apr 2020 13:07:38 +0200
Subject: [PATCH 06/16] Install build tools manually

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a9049e6..1689304 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,9 @@ before_install:
 
 install:
   # accept licenses for all available packages that have not already been accepted
-  - yes | sdkmanager --licenses >/dev/null
+  #- yes | sdkmanager --licenses >/dev/null
+  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "build-tools;28.0.3" 
 
 before_script:
   # set executable flag for gradle wrapper

From 4120889ed1ad6919924e46b34e387996b5fcd3d5 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sat, 25 Apr 2020 13:22:50 +0200
Subject: [PATCH 07/16] Install build tools manually II

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1689304..77a4faf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - yes | sdkmanager "platforms;android-28"
-  - yes | sdkmanager "build-tools;28.0.3" 
+  - echo yes | sdkmanager "platforms;android-28"
+  - echo yes | sdkmanager "build-tools;28.0.3" 
 
 before_script:
   # set executable flag for gradle wrapper

From d3d5bcca0e3cc006e537f18f289b5dc38e78f823 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sat, 25 Apr 2020 13:26:10 +0200
Subject: [PATCH 08/16] Install build tools manually III

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77a4faf..70a5f6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,9 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - echo yes | sdkmanager "platforms;android-28"
-  - echo yes | sdkmanager "build-tools;28.0.3" 
-
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-28" > /dev/null  
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3" > /dev/null
+  
 before_script:
   # set executable flag for gradle wrapper
   - chmod +x gradlew

From fd29a12e65c560a4dd439f4eda788d27b219bd45 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sat, 25 Apr 2020 13:30:17 +0200
Subject: [PATCH 09/16] Install build tools manually IV

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70a5f6a..56b0710 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-28" > /dev/null  
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3" > /dev/null
+  - "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-28"
+  - "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3"
   
 before_script:
   # set executable flag for gradle wrapper

From 54b4535e6799596eb6d3334d4011f7b0a47c7f0b Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 08:40:46 +0200
Subject: [PATCH 10/16] Update build tools vers

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 56b0710..feb35ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-28"
-  - "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3"
+  - "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-29"
+  - "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;29.0.3"
   
 before_script:
   # set executable flag for gradle wrapper

From 90c3be86e1415645bcd6585106004668ec521ab2 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 08:42:59 +0200
Subject: [PATCH 11/16] Install build tools manually V

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index feb35ba..94176c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
+  - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
   - "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-29"
   - "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;29.0.3"
   

From dcd399359d056953e84c889ebb6f2e33a1512a95 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 08:48:23 +0200
Subject: [PATCH 12/16] Install build tools manually V

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 94176c2..37b3159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,13 +22,13 @@ before_install:
   - export ANDROID_HOME=$HOME/sdk
   # create empty cfg file to prevent sdkmanager warning message
   - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-29"
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;29.0.3"
 
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
-  - "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-29"
-  - "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;29.0.3"
+  
   
 before_script:
   # set executable flag for gradle wrapper

From c8563a5c773789ffaaba11a9bd3ca1553a0352f2 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 08:52:28 +0200
Subject: [PATCH 13/16] Install build tools manually VI

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37b3159..f696bc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,8 @@ before_install:
   - export ANDROID_HOME=$HOME/sdk
   # create empty cfg file to prevent sdkmanager warning message
   - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "platforms;android-29"
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" "build-tools;29.0.3"
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "platforms;android-29"
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "build-tools;29.0.3"
 
 install:
   # accept licenses for all available packages that have not already been accepted

From 1ab9b840a88b48b4b5b5e43a4b7e428e2b2ca860 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 09:00:22 +0200
Subject: [PATCH 14/16] install -> assemble

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f696bc5..92c099c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,13 +22,13 @@ before_install:
   - export ANDROID_HOME=$HOME/sdk
   # create empty cfg file to prevent sdkmanager warning message
   - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "platforms;android-29"
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "build-tools;29.0.3"
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "platforms;android-29" > /dev/null
+  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "build-tools;29.0.3" > /dev/null
 
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  
+  - "./gradlew assemble"   
   
 before_script:
   # set executable flag for gradle wrapper

From 4b79206d43b3391727ad784b4822210a437defd8 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 09:04:55 +0200
Subject: [PATCH 15/16] remove install assemble & group lint + test in one
 gradle command

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92c099c..aa7b69f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
 install:
   # accept licenses for all available packages that have not already been accepted
   #- yes | sdkmanager --licenses >/dev/null
-  - "./gradlew assemble"   
+  #- "./gradlew assemble"   
   
 before_script:
   # set executable flag for gradle wrapper
@@ -57,9 +57,7 @@ cache:
 jobs:	
   fast_finish: true
   include:
-    - script: ./gradlew test
-      if: type = pull_request
-    - script: ./gradlew lint
+    - script: ./gradlew test lint
       if: type = pull_request
     - stage: run_ci_pull_request_assemble
       if: type = pull_request

From 58cb6012c4514ee159aea8a59ff50835404a4d34 Mon Sep 17 00:00:00 2001
From: lgvalle <luis.gvalle@gmail.com>
Date: Sun, 26 Apr 2020 09:11:32 +0200
Subject: [PATCH 16/16] Restore travis android component

---
 .travis.yml | 58 +++++++++++++++++++++--------------------------------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa7b69f..f17ce47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,32 @@
-language: minimal
-os: linux
-dist: xenial
-group: edge
+dist: trusty
+language: android
 
 git:
   depth: false
 
-env:
-  global:
-  # for updates check developer.android.com/studio#downloads (current 26.1.1)
-  - ANDROID_SDK_TOOLS=commandlinetools-linux-6200805_latest.zip
-
 before_install:
-  # set JAVA_HOME path
-  - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-  # download and unzip Android SDK command line tools
-  - wget -nv https://dl.google.com/android/repository/$ANDROID_SDK_TOOLS
-  - unzip -q $ANDROID_SDK_TOOLS -d $HOME/sdk
-  # set SDK tools path variable and ANDROID_HOME
-  - export PATH=$PATH:$HOME/sdk/tools/bin
-  - export ANDROID_HOME=$HOME/sdk
-  # create empty cfg file to prevent sdkmanager warning message
-  - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "platforms;android-29" > /dev/null
-  - yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --sdk_root=${ANDROID_HOME} "build-tools;29.0.3" > /dev/null
+  - sudo apt-get -y install xsltproc xml-twig-tools
+
+android:
+  components:
+    # Update Android SDK tools
+    - tools
+    - platform-tools
+
+    # Build tools
+    - build-tools-29.0.3
+
+    # SDK version
+    - android-29
 
-install:
-  # accept licenses for all available packages that have not already been accepted
-  #- yes | sdkmanager --licenses >/dev/null
-  #- "./gradlew assemble"   
-  
-before_script:
-  # set executable flag for gradle wrapper
-  - chmod +x gradlew
-  # create dir for gradle settings
-  - mkdir -p $HOME/.gradle
-  # disable gradle daemon for current user
-  - echo "org.gradle.daemon=false" >> $HOME/.gradle/gradle.properties
-  # set gradle log format to plain
-  - echo "org.gradle.console=plain" >> $HOME/.gradle/gradle.properties  
+    # Additional Google components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+  licenses:
+    - android-sdk-preview-license-.+
+    - android-sdk-license-.+
+    - google-gdk-license-.+
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock