diff --git a/build.gradle b/build.gradle
index 215fb852d..47753c428 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         if (googleFile.exists()) {
             classpath 'com.google.gms:google-services:3.1.0'
         }
@@ -38,18 +38,16 @@ allprojects {
 apply plugin: 'com.android.application'
 
 dependencies {
-    androidTestCompile('com.android.support.test.espresso:espresso-core:+') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:+') {
         exclude module: 'support-annotations'
     }
-    androidTestCompile 'com.jayway.android.robotium:robotium-solo:+'
-    androidTestCompile 'junit:junit:+'
-    compile 'org.apache.commons:commons-compress:+'
+    androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
+    androidTestImplementation 'junit:junit:4.12'
+    implementation 'org.apache.commons:commons-compress:1.16.1'
     if (firebaseEnable()) {
-        compile 'com.google.firebase:firebase-messaging:11.+'
-    } else {
-        compile fileTree(include: 'gcm.jar', dir: 'libs')
+        implementation 'com.google.firebase:firebase-messaging:15.0.2'
     }
-    compile 'com.android.support:support-v4:26.0.1'
+    implementation 'com.android.support:support-v4:26.0.1'
 }
 
 if (firebaseEnable()) {
@@ -84,7 +82,6 @@ excludePackage.add('**/LICENSE.txt')
 android {
     defaultConfig {
         compileSdkVersion 26
-        buildToolsVersion "26.0.1"
         applicationId getPackageName()
         multiDexEnabled true
 
@@ -165,6 +162,7 @@ android {
     packagingOptions {
         pickFirst 'META-INF/NOTICE'
         pickFirst 'META-INF/LICENSE'
+	pickFirst 'META-INF/MANIFEST.MF'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4348bf926..0ef660aa1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle
index 79a59d80d..3a75261e4 100644
--- a/libLinphoneAndroidSdk.gradle
+++ b/libLinphoneAndroidSdk.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
@@ -28,8 +28,8 @@ configurations {
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
-    javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '+'
+    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.16.1'
+    javadocDeps group: 'org.apache.commons', name: 'commons-compress', version: '1.16.1'
 }
 
 def srcDir = ['submodules/mediastreamer2/java/src', 'src/linphone-wrapper']
@@ -44,7 +44,6 @@ excludePackage.add('**/LICENSE.txt')
 android {
     defaultConfig {
         compileSdkVersion 26
-        buildToolsVersion "26.0.0"
         multiDexEnabled true
     }
 
diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle
index 0aedb70c7..4e811dab4 100644
--- a/linphoneAndroidSdk.gradle
+++ b/linphoneAndroidSdk.gradle
@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         if (googleFile.exists()) {
             classpath 'com.google.gms:google-services:3.1.0'
         }
@@ -33,12 +33,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
+    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.16.1'
     if (firebaseEnable()) {
-        compile 'com.google.firebase:firebase-messaging:11.2.0'
+        implementation 'com.google.firebase:firebase-messaging:15.0.2'
     } else {
-        compile fileTree(include: 'gcm.jar', dir: 'libs')
-        compile 'com.android.support:support-v4:+'
+        implementation 'com.android.support:support-v4:26.0.1'
     }
 }
 
@@ -68,7 +67,6 @@ excludePackage.add('**/LICENSE.txt')
 android {
     defaultConfig {
         compileSdkVersion 26
-        buildToolsVersion "26.0.0"
         multiDexEnabled true
     }