diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
index e83821fe..50ec65cd 100644
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@@ -38,10 +38,8 @@ android {
                 appName = parent.name
             }
 
-            variant.outputs.each { output ->
-                def newApkName
-                newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk"
-                output.outputFile = new File(output.outputFile.parent, newApkName)
+            variant.outputs.all { output ->
+                outputFileName = "${appName}-${output.baseName}-${variant.versionName}.apk"
             }
         }
 
@@ -77,9 +75,9 @@ def getBuildConfigField(String property){
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:26.0.0'
-    compile 'com.android.support:appcompat-v7:26.0.0'
-    compile 'com.google.android.gms:play-services-analytics:11.0.4'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.google.android.gms:play-services-analytics:11.4.2'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
diff --git a/build.gradle b/build.gradle
index 9652155a..a6d5b5e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'org.ajoberstar:grgit:1.8.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d50e32c7..33dd2e14 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 03 17:05:52 CET 2017
+#Wed Oct 25 20:37:21 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip