4 files changed, 18 insertions, 21 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 1950b2357de5..c2d4aeae0e56 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -17,31 +17,34 @@ allprojects {
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 // compile-time dependencies
 dependencies {
-    compile fileTree(dir: "${liboInstdir}/${liboUREJavaFolder}", include: [
+    implementation fileTree(dir: "${liboInstdir}/${liboUREJavaFolder}", include: [
             "java_uno.jar",
             "juh.jar",
             "jurt.jar",
             "ridl.jar",
             "unoloader.jar"
     ])
-    compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
-    debugCompile(name:'owncloud_android_lib-debug', ext:'aar')
-    releaseCompile(name:'owncloud_android_lib-release', ext:'aar')
-    compile 'com.android.support:design:26.1.0' // also pulls-in corresponding support libraries
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
+    debugImplementation(name:'owncloud_android_lib-debug', ext:'aar')
+    releaseImplementation(name:'owncloud_android_lib-release', ext:'aar')
+    implementation 'com.android.support:design:27.0.1' // also pulls-in corresponding support libraries
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion "27.0.1"
     compileOptions {
         // silence some java-language features hints
         sourceCompatibility 6
@@ -77,9 +80,11 @@ android {
             manifestPlaceholders = [installLocation: "preferExternal", extractNativeLibs: "true"]
         }
     }
+
+    flavorDimensions "default"
     productFlavors {
-        strippedUI
-        fullUI
+        strippedUI.dimension "default"
+        fullUI.dimension "default"
     }
 }
 
diff --git a/android/source/gradle.properties b/android/source/gradle.properties
index 899c9f99f396..ad1671ef57fd 100644
--- a/android/source/gradle.properties
+++ b/android/source/gradle.properties
@@ -1 +1 @@
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx3072m
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties
index 5dc276a1ab03..26a7675eb5fc 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 14 19:29:07 CET 2017
+#Mon Nov 20 19:19:05 CET 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
diff --git a/android/source/jni/Android.mk b/android/source/jni/Android.mk
deleted file mode 100644
index 939a1ea503bb..000000000000
--- a/android/source/jni/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Needed just to satisfy ndk-gdb for now, but maybe later we will actually add
-# some JNI code here
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(BUILD_SHARED_LIBRARY)