diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
index 41293a1197..646a3ccf15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
@@ -153,7 +153,7 @@ object EmojiFiles {
             objectMapper.readValue(it, Version::class.java)
           }
         } catch (e: Exception) {
-          Log.w(TAG, "Could not read current emoji version from disk.")
+          Log.w(TAG, "Could not read current emoji version from disk.", e)
           null
         }
 
diff --git a/build.gradle b/build.gradle
index 5249c4ebd5..349166a219 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url 'https://storage.googleapis.com/r8-releases/raw'
-        }
         jcenter {
             content {
                 includeVersion 'org.jetbrains.trove4j', 'trove4j', '20160824'
@@ -20,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools:r8:3.0.73'
+        classpath 'com.android.tools:r8:3.3.28'
         classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 196646dd75..bc56fcefc7 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -928,6 +928,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="dd8d28d58fe09e47bafefaa1c07357c4e523b183bdf7b2a36ee372a8c3ba3882" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="r8" version="3.3.28">
+         <artifact name="r8-3.3.28.jar">
+            <sha256 value="8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="repository" version="26.6.3">
          <artifact name="repository-26.6.3.jar">
             <sha256 value="83d7a8aadf6899d3345b03a615da086455d6e38dd0c42c7121bc6bc3cec957a8" origin="Generated by Gradle"/>