diff --git a/build.gradle b/build.gradle
index 11e74dd70c..4d72f194a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath('com.dicedmelon.gradle:jacoco-android:0.1.3')
+        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath('com.dicedmelon.gradle:jacoco-android:0.1.3') {
+            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        }
     }
 }
 
@@ -145,7 +147,7 @@ android {
         exclude 'META-INF/LICENSE'
     }
 
-    task checkstyle(type: Checkstyle) {
+    tasks.register("checkstyle", Checkstyle) {
         configFile = file("${rootProject.projectDir}/checkstyle.xml")
         configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath
         source 'src'
@@ -154,7 +156,7 @@ android {
         classpath = files()
     }
 
-    task pmd(type: Pmd) {
+    tasks.register("pmd", Pmd) {
         ruleSetFiles = files("${project.rootDir}/pmd-ruleset.xml")
         ignoreFailures = false
         ruleSets = []
@@ -175,7 +177,7 @@ android {
         }
     }
 
-    task findbugs(type: FindBugs) {
+    tasks.register("findbugs", FindBugs) {
         ignoreFailures = false
         effort = "max"
         reportLevel = "medium"
@@ -294,7 +296,7 @@ android.applicationVariants.all { variant ->
     }
 }
 
-task combinedTestReport(type: JacocoReport) {
+tasks.register("combinedTestReport", JacocoReport) {
 
     reports {
         xml.enabled = true
diff --git a/gradle.properties b/gradle.properties
index 753f5842be..da186aad4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # workaround since lombok and desugering have an issue
 # to be fixed with gradle Android plugin 3.3.0
-android.enableD8.desugaring=false
 android.enableJetifier=true
 android.useAndroidX=true
+android.debug.obsoleteApi=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c433f5e6ad..e386abc940 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
-distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionSha256Sum=36bf7ff499223d5139f005822130ccca784c91591b514677fd376eed966c907e
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 89df7437f0..aa36699219 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 81 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 72 warnings</span>
diff --git a/src/main/res/layout/activity_sso_grant_permission.xml b/src/main/res/layout/activity_sso_grant_permission.xml
index 801e17bc07..1ddc59d670 100644
--- a/src/main/res/layout/activity_sso_grant_permission.xml
+++ b/src/main/res/layout/activity_sso_grant_permission.xml
@@ -31,19 +31,23 @@
         android:layout_gravity="top|start"
         android:contentDescription="@null"
         android:src="@drawable/background"
-        app:layout_constraintTop_toTopOf="@+id/permissionText" />
+        app:layout_constraintTop_toTopOf="@+id/permissionText"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/permissionText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="@dimen/zero"
-        android:paddingLeft="@dimen/permission_dialog_text_padding"
+        android:paddingStart="@dimen/zero"
         android:paddingRight="@dimen/zero"
-        android:paddingStart="@dimen/permission_dialog_text_padding"
+        android:paddingLeft="@dimen/zero"
         android:paddingBottom="@dimen/standard_padding"
         android:textSize="@dimen/permission_dialog_text_size"
         app:layout_constraintBottom_toTopOf="@+id/btnGrant"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Grant Nextcloud News access to your Nextcloud account incrediblyLong_username_with_123456789_number@Nextcloud_dummy.com?" />