diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2e35094f..e33c5d34 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,19 +123,12 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
         project.android.buildToolsVersion,
         "aapt2"
     )
-    val mapping = Paths.get(
-        project.buildDir.path,
-        "outputs",
-        "mapping",
-        "release",
-        "shortening.txt"
-    )
     val zip = Paths.get(
         project.buildDir.path,
         "intermediates",
-        "shrunk_processed_res",
+        "optimized_processed_res",
         "release",
-        "resources-release-stripped.ap_"
+        "resources-release-optimize.ap_"
     )
     val optimized = File("${zip}.opt")
     val cmd = exec {
@@ -143,8 +136,6 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
             aapt2, "optimize",
             "--collapse-resource-names",
             "--enable-sparse-encoding",
-            "--shorten-resource-paths",
-            "--resource-path-shortening-map", mapping,
             "-o", optimized,
             zip
         )
@@ -157,7 +148,7 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
 }
 
 tasks.whenTaskAdded {
-    if (name == "shrinkReleaseRes") {
+    if (name == "optimizeReleaseResources") {
         finalizedBy(optimizeReleaseRes)
     }
 }
@@ -171,7 +162,7 @@ dependencies {
     implementation("androidx.browser:browser:1.3.0")
     implementation("androidx.constraintlayout:constraintlayout:2.0.4")
     implementation("androidx.core:core:1.3.2")
-    implementation("androidx.fragment:fragment:1.3.1")
+    implementation("androidx.fragment:fragment:1.3.2")
     implementation("androidx.recyclerview:recyclerview:1.1.0")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("com.caverock:androidsvg-aar:1.4")
diff --git a/build.gradle.kts b/build.gradle.kts
index a0cd0d59..f61b8878 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,8 +26,8 @@ buildscript {
         maven("https://storage.googleapis.com/r8-releases/raw")
     }
     dependencies {
-        classpath("com.android.tools:r8:3.0.30-dev")
-        classpath("com.android.tools.build:gradle:7.0.0-alpha12")
+        classpath("com.android.tools:r8:3.0.32-dev")
+        classpath("com.android.tools.build:gradle:7.0.0-alpha13")
         classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r")
         classpath(kotlin("gradle-plugin", version = "1.4.32"))
     }
diff --git a/gradle.properties b/gradle.properties
index 28382bcd..ab664ace 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,3 @@
 #Sat Jan 30 19:20:27 CST 202130.0.322.0.7026061
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableResourceOptimizations=false