diff --git a/app/build.gradle b/app/build.gradle
index f055a2b3f..bc7a66f05 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,6 +8,7 @@ findbugs {
 
 android {
     compileSdkVersion 29
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
@@ -15,49 +16,59 @@ android {
         targetSdkVersion 29
         versionCode 53
         versionName "1.6.1"
-        vectorDrawables.useSupportLibrary = true
+
+        vectorDrawables.useSupportLibrary true
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix ".debug"
         }
     }
+
+    compileOptions {
+        encoding "UTF-8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
-        disable "GoogleAppIndexingWarning"
-        disable "ButtonStyle"
-        disable "AlwaysShowAction"
-        disable "MissingTranslation"
-        disable "MissingPrefix"
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
     }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
     testOptions {
         unitTests {
-            includeAndroidResources = true
+            includeAndroidResources true
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+// AndroidX
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
+
+// Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar'
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'org.apache.commons:commons-csv:1.5'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.jaredrummler:colorpicker:1.0.2'
-    implementation group: 'com.google.guava', name: 'guava', version: '20.0'
-    implementation "com.vanniktech:vntnumberpickerpreference:1.0.0"
-    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.guava:guava:20.0'
+    implementation 'com.vanniktech:vntnumberpickerpreference:1.0.0'
+
+// Testing
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.0.2"
+    testImplementation 'org.robolectric:robolectric:4.0.2'
 }
 
 task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
diff --git a/build.gradle b/build.gradle
index e95b2f8d5..e5e7e895a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,13 @@
 
 buildscript {
     repositories {
-        jcenter()
-
-        // For the Android Gradle plugin
         google()
+        jcenter()
+        maven { url "https://jitpack.io" }
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,9 +17,9 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
-        maven { url 'https://jitpack.io' }
         google()
+        jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index a74d1fa9b..acf164f6c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,11 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-# The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains
-# a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug.
-# See: https://issuetracker.google.com/issues/64434571
-android.enableAapt2=false
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true
\ No newline at end of file