diff --git a/app/build.gradle b/app/build.gradle
index 230c1711e..110d27b39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,6 +88,10 @@ android {
         }
     }
 
+    compileOptions {
+        coreLibraryDesugaringEnabled = true
+    }
+
     namespace = 'org.mozilla.reference.browser'
 }
 
@@ -230,6 +234,8 @@ project.configurations.configureEach {
 }
 
 dependencies {
+    coreLibraryDesugaring libs.desugar.jdk.libs
+
     implementation libs.androidx.activity
     implementation libs.androidx.annotation
     implementation libs.androidx.appcompat
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a5117318..104cb05e0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Android Components
-android-components = "139.0.20250418091223"
+android-components = "139.0.20250421090405"
 
 # AGP
 android-gradle-plugin = "8.9.1"
@@ -10,6 +10,7 @@ kotlin = "2.1.20"
 kotlinx-coroutines = "1.10.2"
 
 # Google
+desugar-jdk-libs = "2.1.5"
 material = "1.12.0"
 
 # AndroidX
@@ -55,6 +56,7 @@ okio = "3.4.0"
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 
 # Google
+desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
 google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 # AndroidX