diff --git a/app/build.gradle b/app/build.gradle
index 1071633d04..50ab05c7a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -110,9 +110,6 @@ android {
         }
     }
 
-    lintOptions {
-        disable 'ProtectedPermissions'
-    }
 
     testOptions {
         unitTests {
@@ -125,6 +122,9 @@ android {
             useLegacyPackaging true
         }
     }
+    lint {
+        disable 'ProtectedPermissions'
+    }
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
@@ -214,11 +214,11 @@ task downloadBootstraps() {
     doLast {
         def packageVariant = project.ext.packageVariant
         if (packageVariant == "apt-android-7") {
-            def version = "2022.04.28-r5" + "+" + packageVariant
-            downloadBootstrap("aarch64", "4a51a7eb209fe82efc24d52e3cccc13165f27377290687cb82038cbd8e948430", version)
-            downloadBootstrap("arm", "6459a786acbae50d4c8a36fa1c3de6a4dd2d482572f6d54f73274709bd627325", version)
-            downloadBootstrap("i686", "919d212b2f19e08600938db4079e794e947365022dbfd50ac342c50fcedcd7be", version)
-            downloadBootstrap("x86_64", "61b02fdc03ea4f5d9da8d8cf018013fdc6659e6da6cbf44e9b24d1c623580b89", version)
+            def version = "2022.07.31-r1" + "+" + packageVariant
+            downloadBootstrap("aarch64", "ff4711f5fdd0dbb1b904a6e7ad0534cb2926f54756f6ca2fa0d3b6084a8df8bf", version)
+            downloadBootstrap("arm", "81f10d638e18969006a3fbb5dc6eb3879e23fee85df5b0976809fbe7d0810458", version)
+            downloadBootstrap("i686", "9f9c03597e06e6433a85b1a125134c561cc2e89b2d9724e60f57312e2306f7ac", version)
+            downloadBootstrap("x86_64", "6f9ce5546d1e50065be6431bb21ef87deb9c7bf5fc795b47349fd58c13c2754d", version)
         } else if (packageVariant == "apt-android-5") {
             def version = "2022.04.28-r6" + "+" + packageVariant
             downloadBootstrap("aarch64", "913609d439415c828c5640be1b0561467e539cb1c7080662decaaca2fb4820e7", version)
diff --git a/build.gradle b/build.gradle
index 80ddd4bde1..47a89a1129 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index fc751ab345..d89ad68a52 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,9 +16,9 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 
 minSdkVersion=21
-targetSdkVersion=28
-ndkVersion=22.1.7171670
-compileSdkVersion=30
+targetSdkVersion=31
+ndkVersion=25.0.8775105
+compileSdkVersion=31
 
 markwonVersion=4.6.2
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a0f7639f7d..669386b870 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists