diff --git a/app/build.gradle b/app/build.gradle
index 0eba0f89e0..b1eb6084b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,16 +37,6 @@ android {
     }
 
 
-    lintOptions {
-        quiet true
-        abortOnError false
-        ignoreWarnings true
-        disable 'InvalidPackage'            //Some libraries have issues with this.
-        disable 'OldTargetApi'              //Lint gives this warning but SDK 20 would be Android L Beta.
-        disable 'IconDensities'             //For testing purpose. This is safe to remove.
-        disable 'IconMissingDensityFolder'  //For testing purpose. This is safe to remove.
-    }
-
 //    signingConfigs {
 //        //For proper signing, use debuggable false for a build.
 //        release {
@@ -124,6 +114,12 @@ android {
     androidExtensions {
         experimental = true
     }
+    lint {
+        abortOnError false
+        disable 'InvalidPackage', 'OldTargetApi', 'IconDensities', 'IconMissingDensityFolder'
+        ignoreWarnings true
+        quiet true
+    }
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index 7cb1c2e6a8..c490f0df52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath 'com.google.gms:google-services:4.3.8'
diff --git a/clipboard/build.gradle b/clipboard/build.gradle
index b83a7f2c6b..f009063d33 100644
--- a/clipboard/build.gradle
+++ b/clipboard/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 7e2f78250f..9f51a98a21 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -10,15 +10,10 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     buildTypes {
         release {
@@ -70,6 +65,9 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11
     }
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {
diff --git a/device/build.gradle b/device/build.gradle
index 7c025980fa..d055b7eb0d 100644
--- a/device/build.gradle
+++ b/device/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5f736f238e..f614b1fba5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
diff --git a/library-emojifier/build.gradle b/library-emojifier/build.gradle
index 26bd3f8e84..cd9cac586f 100644
--- a/library-emojifier/build.gradle
+++ b/library-emojifier/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
diff --git a/library-page-icon-picker-widget/build.gradle b/library-page-icon-picker-widget/build.gradle
index 9c07e76f99..1d7bd7cf6e 100644
--- a/library-page-icon-picker-widget/build.gradle
+++ b/library-page-icon-picker-widget/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
diff --git a/library-syntax-highlighter/build.gradle b/library-syntax-highlighter/build.gradle
index b4b2d744c8..bcc7c5b9fc 100644
--- a/library-syntax-highlighter/build.gradle
+++ b/library-syntax-highlighter/build.gradle
@@ -11,8 +11,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 504661e8b1..a7345bd5be 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -48,11 +48,10 @@ android {
     androidExtensions {
         experimental = true
     }
-
-    lintOptions {
-        // https://issuetracker.google.com/issues/169249668#comment8
+    lint {
         disable 'NullSafeMutableLiveData'
     }
+
 }
 
 dependencies {
diff --git a/protocol/build.gradle b/protocol/build.gradle
index 3250e38050..f4f21abea1 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion config["min_sdk"]
         targetSdkVersion config["target_sdk"]
-        versionCode config["version_code"]
-        versionName config["version_name"]
 
         testInstrumentationRunner config["test_runner"]
     }