diff --git a/.travis.yml b/.travis.yml
index a004be20..86ae9c28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: android
+
 android:
    components:
    - tools
-   - tools
+   - platform-tools
+   - tools # Upgrade again after upgrading platform-tools.
 
 jdk: oraclejdk8
 
@@ -17,10 +19,13 @@ before_install:
        && exit 0 || true
 
 before_script:
-  - (while sleep 3; do echo "y"; done) | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "build-tools;26.0.0" "platforms;android-26"
+  - echo $ANDROID_HOME
+  - mkdir -p $ANDROID_HOME/licenses
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_HOME/licenses/android-sdk-license
+  - echo -e "\n504667f4c0de7af1a06de9f4b1727b84351f2910" > $ANDROID_HOME/licenses/android-sdk-preview-license
 
 script:
-  - ./gradlew clean assembleDebug --stacktrace
+  - ./gradlew clean assembleDebug --no-daemon --stacktrace
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -30,6 +35,7 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
index 45cee324..0465ccc8 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,7 @@ Read the [**contribution guide**](.github/CONTRIBUTING.md) for more detailed inf
   <p>- Portuguese <a href="https://github.com/caiorrs">@caiorrs</a></p>
   <p>- Czech <a href="https://github.com/hejsekvojtech">@hejsekvojtech</a></p>
   <p>- Spanish <a href="https://github.com/alete89">@alete89</a></p>
+  <p>- French <a href="https://github.com/ptt-homme">@ptt-homme</a></p>
 </details>
 
 ## FAQ
diff --git a/debug_gradle.properties b/debug_gradle.properties
index ab295c4b..d5332fd0 100644
--- a/debug_gradle.properties
+++ b/debug_gradle.properties
@@ -8,4 +8,5 @@ github_secret=b2d158f949d3615078eaf570ff99eba81cfa1ff9
 imgur_client_id=5fced7f255e1dc9
 imgur_secret=03025033403196a4b68b48f0738e67ef136ad64f
 redirect_url=fasthub://login
-android.enableD8=true
\ No newline at end of file
+android.enableD8=true
+android.sdk.channel=2