diff --git a/.travis.yml b/.travis.yml
index 464269b3b..d34d01f17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,4 +44,4 @@ script:
   - ./tools/check/check_code_quality.sh
   - ./tools/travis/check_pr.sh
   # Check that indonesian files are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
-  - diff ./matrix-sdk/src/main/res/values-id/strings.xml ./matrix-sdk/src/main/res/values-in/strings.xml
+  - diff ./matrix-sdk/src/main/res/values-id/strings.xml ./matrix-sdk/src/main/res/values-in/strings.xml
\ No newline at end of file
diff --git a/generateJavadoc.sh b/generateJavadoc.sh
index 506111169..4e0a95182 100755
--- a/generateJavadoc.sh
+++ b/generateJavadoc.sh
@@ -8,4 +8,4 @@ cd ./matrix-sdk/build/docs/
 tar -zcvf ../../matrix-sdk-javadoc.tar.gz ./javadoc/
 cd -
 
-echo "Success!"
+echo "Success!"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index ad113e105..983be0a2a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,6 @@
 # To be able to analyse with sonar, put these variables in ~/.gradle/gradle.properties
 # SONAR_LOGIN=sonar_login
 
-org.gradle.configureondemand=false
+org.gradle.configureondemand=true
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true