diff --git a/build.gradle b/build.gradle
index 78f2639..91c6b1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,10 +16,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
     }
 }
 
@@ -51,24 +52,27 @@ int getMyVersionCode() {
 }
 
 repositories {
+    google()
     jcenter()
 }
 
 dependencies {
-    compile 'org.microg:unifiednlp-api:1.5.6'
-    compile 'org.microg:address-formatter:0.2.1'
-    compile 'com.takisoft.fix:preference-v7:25.3.1.0'
+    implementation 'org.microg:unifiednlp-api:1.5.6'
+    implementation 'org.microg:address-formatter:0.2.1'
+    //noinspection GradleCompatible,GradleCompatible
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.takisoft.fix:preference-v7:25.3.1.0'
 }
 
-android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         versionName getMyVersionName()
         versionCode(20000 + getMyVersionCode())
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 29
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..dbb7bf7
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3754efb..a58feb7 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 12 23:24:00 UTC 2017
+#Sun Sep 06 12:08:56 CEST 2020
 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-6.1.1-all.zip
diff --git a/src/main/java/org/microg/nlp/backend/nominatim/SettingsActivity.java b/src/main/java/org/microg/nlp/backend/nominatim/SettingsActivity.java
index 96721ee..a60334d 100644
--- a/src/main/java/org/microg/nlp/backend/nominatim/SettingsActivity.java
+++ b/src/main/java/org/microg/nlp/backend/nominatim/SettingsActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 
 import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;