diff --git a/build.gradle.kts b/build.gradle.kts
index a40aafb73..9a839298b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Verify
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
-val gradleVersionRequired = "8.2.1"
+val gradleVersionRequired = "8.10.2"
 val gradleVersionReceived = gradle.gradleVersion
 
 if (gradleVersionRequired != gradleVersionReceived) {
@@ -25,6 +25,10 @@ plugins {
         .version("1.9.0")
         .apply(false)
 
+    id("com.github.ben-manes.versions")
+        .version("0.51.0")
+        .apply(true)
+
     /*
      * The AndroidX plugin for navigation (including view binding generation).
      *
@@ -36,11 +40,11 @@ plugins {
         .apply(false)
 
     id("com.android.library")
-        .version("8.1.0")
+        .version("8.5.0")
         .apply(false)
 
     id("com.android.application")
-        .version("8.1.0")
+        .version("8.5.0")
         .apply(false)
 
     /*
@@ -587,6 +591,7 @@ allprojects {
                 encoding = "UTF-8"
                 sourceCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
                 targetCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
+                isCoreLibraryDesugaringEnabled = true
             }
         }
 
@@ -642,6 +647,7 @@ allprojects {
                 encoding = "UTF-8"
                 sourceCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
                 targetCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
+                isCoreLibraryDesugaringEnabled = true
             }
 
             android.testOptions {
@@ -762,6 +768,7 @@ allprojects {
         "androidTestReleaseImplementation",
         "androidTestReleaseImplementationDependenciesMetadata",
         "annotationProcessor",
+        "coreLibraryDesugaring",
         "debugAndroidTestCompilationImplementation",
         "debugAndroidTestImplementation",
         "debugAndroidTestImplementationDependenciesMetadata",
@@ -822,7 +829,6 @@ allprojects {
         configurations.all {
             isTransitive = transitiveConfigurations.contains(name)
             // resolutionStrategy.failOnVersionConflict()
-            resolutionStrategy.cacheChangingModulesFor(30, TimeUnit.SECONDS)
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c4c..a4b76b953 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d5f..df97d72b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca14..f5feea6d6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85be..9b42019c7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
index 7238a0f29..f741f7d49 160000
--- a/org.thepalaceproject.android.platform
+++ b/org.thepalaceproject.android.platform
@@ -1 +1 @@
-Subproject commit 7238a0f29cc7fcd04155f564155febb9d31676a7
+Subproject commit f741f7d490a16ce6067cb54595502a7c4ca0ef41
diff --git a/palace-ui/build.gradle.kts b/palace-ui/build.gradle.kts
index f7067abd5..f6d13aecc 100644
--- a/palace-ui/build.gradle.kts
+++ b/palace-ui/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.appcompat)
diff --git a/simplified-accessibility/build.gradle.kts b/simplified-accessibility/build.gradle.kts
index 69a85acf9..1046f8846 100644
--- a/simplified-accessibility/build.gradle.kts
+++ b/simplified-accessibility/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-registry-api"))
     implementation(project(":simplified-opds-core"))
diff --git a/simplified-accounts-api/build.gradle.kts b/simplified-accounts-api/build.gradle.kts
index 427fc22c1..a3211bf15 100644
--- a/simplified-accounts-api/build.gradle.kts
+++ b/simplified-accounts-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-announcements"))
     implementation(project(":simplified-links"))
     implementation(project(":simplified-opds-core"))
diff --git a/simplified-accounts-database-api/build.gradle.kts b/simplified-accounts-database-api/build.gradle.kts
index a0bdac935..825ff4abc 100644
--- a/simplified-accounts-database-api/build.gradle.kts
+++ b/simplified-accounts-database-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-registry-api"))
     implementation(project(":simplified-accounts-source-spi"))
diff --git a/simplified-accounts-database/build.gradle.kts b/simplified-accounts-database/build.gradle.kts
index b76b5d0f0..3823bccda 100644
--- a/simplified-accounts-database/build.gradle.kts
+++ b/simplified-accounts-database/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-json"))
diff --git a/simplified-accounts-json/build.gradle.kts b/simplified-accounts-json/build.gradle.kts
index 1ac4e8ffa..66477e06f 100644
--- a/simplified-accounts-json/build.gradle.kts
+++ b/simplified-accounts-json/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-announcements"))
     implementation(project(":simplified-books-formats-api"))
diff --git a/simplified-accounts-registry-api/build.gradle.kts b/simplified-accounts-registry-api/build.gradle.kts
index ee9107391..11876f539 100644
--- a/simplified-accounts-registry-api/build.gradle.kts
+++ b/simplified-accounts-registry-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-taskrecorder-api"))
 
diff --git a/simplified-accounts-registry/build.gradle.kts b/simplified-accounts-registry/build.gradle.kts
index 470ab1742..6d102e9df 100644
--- a/simplified-accounts-registry/build.gradle.kts
+++ b/simplified-accounts-registry/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-registry-api"))
     implementation(project(":simplified-accounts-source-spi"))
diff --git a/simplified-accounts-source-filebased/build.gradle.kts b/simplified-accounts-source-filebased/build.gradle.kts
index 7b3b1e829..c8837f9f8 100644
--- a/simplified-accounts-source-filebased/build.gradle.kts
+++ b/simplified-accounts-source-filebased/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-json"))
     implementation(project(":simplified-accounts-source-spi"))
diff --git a/simplified-accounts-source-nyplregistry/build.gradle.kts b/simplified-accounts-source-nyplregistry/build.gradle.kts
index a0e4f5c72..1f13551df 100644
--- a/simplified-accounts-source-nyplregistry/build.gradle.kts
+++ b/simplified-accounts-source-nyplregistry/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-json"))
     implementation(project(":simplified-accounts-registry-api"))
diff --git a/simplified-accounts-source-spi/build.gradle.kts b/simplified-accounts-source-spi/build.gradle.kts
index b1d11dca1..6c64372d8 100644
--- a/simplified-accounts-source-spi/build.gradle.kts
+++ b/simplified-accounts-source-spi/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-buildconfig-api"))
     implementation(project(":simplified-taskrecorder-api"))
diff --git a/simplified-adobe-extensions/build.gradle.kts b/simplified-adobe-extensions/build.gradle.kts
index b9fe62a9d..1aa6218e8 100644
--- a/simplified-adobe-extensions/build.gradle.kts
+++ b/simplified-adobe-extensions/build.gradle.kts
@@ -9,6 +9,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-files"))
     implementation(project(":simplified-json-core"))
diff --git a/simplified-analytics-api/build.gradle.kts b/simplified-analytics-api/build.gradle.kts
index 4b7014482..0547cbbc7 100644
--- a/simplified-analytics-api/build.gradle.kts
+++ b/simplified-analytics-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-opds-core"))
 
diff --git a/simplified-analytics-circulation/build.gradle.kts b/simplified-analytics-circulation/build.gradle.kts
index 253ade7d7..c9e11e172 100644
--- a/simplified-analytics-circulation/build.gradle.kts
+++ b/simplified-analytics-circulation/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-analytics-api"))
     implementation(project(":simplified-threads"))
diff --git a/simplified-android-ktx/build.gradle.kts b/simplified-android-ktx/build.gradle.kts
index 4b50c317c..d867c5afd 100644
--- a/simplified-android-ktx/build.gradle.kts
+++ b/simplified-android-ktx/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core)
diff --git a/simplified-app-palace/build.gradle.kts b/simplified-app-palace/build.gradle.kts
index 4514c2723..710adfd27 100644
--- a/simplified-app-palace/build.gradle.kts
+++ b/simplified-app-palace/build.gradle.kts
@@ -234,6 +234,8 @@ afterEvaluate {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":palace-ui"))
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-accounts-api"))
diff --git a/simplified-bookmarks-api/build.gradle.kts b/simplified-bookmarks-api/build.gradle.kts
index 535a81e6a..68749bbfd 100644
--- a/simplified-bookmarks-api/build.gradle.kts
+++ b/simplified-bookmarks-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-books-api"))
diff --git a/simplified-bookmarks/build.gradle.kts b/simplified-bookmarks/build.gradle.kts
index e21669e4c..0d14da51c 100644
--- a/simplified-bookmarks/build.gradle.kts
+++ b/simplified-bookmarks/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-bookmarks-api"))
diff --git a/simplified-books-api/build.gradle.kts b/simplified-books-api/build.gradle.kts
index 4bb204683..4c9eb3fbd 100644
--- a/simplified-books-api/build.gradle.kts
+++ b/simplified-books-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-json-core"))
     implementation(project(":simplified-lcp"))
diff --git a/simplified-books-audio/build.gradle.kts b/simplified-books-audio/build.gradle.kts
index b0a331acc..b317a2eaf 100644
--- a/simplified-books-audio/build.gradle.kts
+++ b/simplified-books-audio/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-books-database-api"))
     implementation(project(":simplified-presentableerror-api"))
diff --git a/simplified-books-borrowing/build.gradle.kts b/simplified-books-borrowing/build.gradle.kts
index dc399a6cf..aa51f903a 100644
--- a/simplified-books-borrowing/build.gradle.kts
+++ b/simplified-books-borrowing/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-adobe-extensions"))
diff --git a/simplified-books-bundled-api/build.gradle.kts b/simplified-books-bundled-api/build.gradle.kts
index e78f19153..93667ded0 100644
--- a/simplified-books-bundled-api/build.gradle.kts
+++ b/simplified-books-bundled-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
 
diff --git a/simplified-books-controller-api/build.gradle.kts b/simplified-books-controller-api/build.gradle.kts
index c7a51e0f2..a0f08dc7e 100644
--- a/simplified-books-controller-api/build.gradle.kts
+++ b/simplified-books-controller-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-books-api"))
diff --git a/simplified-books-controller/build.gradle.kts b/simplified-books-controller/build.gradle.kts
index 5db5a6dd2..024e45894 100644
--- a/simplified-books-controller/build.gradle.kts
+++ b/simplified-books-controller/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-registry"))
diff --git a/simplified-books-covers/build.gradle.kts b/simplified-books-covers/build.gradle.kts
index 1b45a2dd6..330cd81c8 100644
--- a/simplified-books-covers/build.gradle.kts
+++ b/simplified-books-covers/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-bundled-api"))
     implementation(project(":simplified-books-registry-api"))
diff --git a/simplified-books-database-api/build.gradle.kts b/simplified-books-database-api/build.gradle.kts
index e5271f58d..bd8188b7c 100644
--- a/simplified-books-database-api/build.gradle.kts
+++ b/simplified-books-database-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-formats-api"))
diff --git a/simplified-books-database/build.gradle.kts b/simplified-books-database/build.gradle.kts
index 978af9792..e76625c81 100644
--- a/simplified-books-database/build.gradle.kts
+++ b/simplified-books-database/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-bookmarks-api"))
     implementation(project(":simplified-books-api"))
diff --git a/simplified-books-formats-api/build.gradle.kts b/simplified-books-formats-api/build.gradle.kts
index bb138eb58..1a4ca9b1d 100644
--- a/simplified-books-formats-api/build.gradle.kts
+++ b/simplified-books-formats-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
 
     implementation(libs.irradia.mime.api)
diff --git a/simplified-books-formats/build.gradle.kts b/simplified-books-formats/build.gradle.kts
index d77fe47c5..9580759e8 100644
--- a/simplified-books-formats/build.gradle.kts
+++ b/simplified-books-formats/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-formats-api"))
 
diff --git a/simplified-books-preview/build.gradle.kts b/simplified-books-preview/build.gradle.kts
index 7a5ae4ecf..fd4c749c5 100644
--- a/simplified-books-preview/build.gradle.kts
+++ b/simplified-books-preview/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-audio"))
     implementation(project(":simplified-books-database-api"))
     implementation(project(":simplified-books-formats-api"))
diff --git a/simplified-books-registry-api/build.gradle.kts b/simplified-books-registry-api/build.gradle.kts
index 20081fa3e..3c071c7dd 100644
--- a/simplified-books-registry-api/build.gradle.kts
+++ b/simplified-books-registry-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-opds-core"))
     implementation(project(":simplified-presentableerror-api"))
diff --git a/simplified-books-time-tracking/build.gradle.kts b/simplified-books-time-tracking/build.gradle.kts
index 43a4ce662..a45fe30fa 100644
--- a/simplified-books-time-tracking/build.gradle.kts
+++ b/simplified-books-time-tracking/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-crashlytics-api"))
diff --git a/simplified-boot-api/build.gradle.kts b/simplified-boot-api/build.gradle.kts
index b2c77e247..34c55e655 100644
--- a/simplified-boot-api/build.gradle.kts
+++ b/simplified-boot-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-presentableerror-api"))
 
     implementation(libs.google.failureaccess)
diff --git a/simplified-content-api/build.gradle.kts b/simplified-content-api/build.gradle.kts
index a2376764a..69844b9ad 100644
--- a/simplified-content-api/build.gradle.kts
+++ b/simplified-content-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
     implementation(libs.slf4j)
diff --git a/simplified-crashlytics-api/build.gradle.kts b/simplified-crashlytics-api/build.gradle.kts
index bb22f60b7..ffd782801 100644
--- a/simplified-crashlytics-api/build.gradle.kts
+++ b/simplified-crashlytics-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
     implementation(libs.logback.android)
diff --git a/simplified-crashlytics/build.gradle.kts b/simplified-crashlytics/build.gradle.kts
index c702f5582..df0e45c0f 100644
--- a/simplified-crashlytics/build.gradle.kts
+++ b/simplified-crashlytics/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-crashlytics-api"))
 
     implementation(libs.kotlin.stdlib)
diff --git a/simplified-documents/build.gradle.kts b/simplified-documents/build.gradle.kts
index e9961956d..4bad8a80c 100644
--- a/simplified-documents/build.gradle.kts
+++ b/simplified-documents/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.google.guava)
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
diff --git a/simplified-feeds-api/build.gradle.kts b/simplified-feeds-api/build.gradle.kts
index 2d35fca06..d54871bc3 100644
--- a/simplified-feeds-api/build.gradle.kts
+++ b/simplified-feeds-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-bundled-api"))
diff --git a/simplified-lcp/build.gradle.kts b/simplified-lcp/build.gradle.kts
index 6d62755ee..683d51c89 100644
--- a/simplified-lcp/build.gradle.kts
+++ b/simplified-lcp/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.appcompat)
diff --git a/simplified-main/build.gradle.kts b/simplified-main/build.gradle.kts
index 1a328b166..3a793e805 100644
--- a/simplified-main/build.gradle.kts
+++ b/simplified-main/build.gradle.kts
@@ -20,6 +20,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":palace-ui"))
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-accounts-api"))
diff --git a/simplified-metrics-api/build.gradle.kts b/simplified-metrics-api/build.gradle.kts
index 2d536d0dd..630033385 100644
--- a/simplified-metrics-api/build.gradle.kts
+++ b/simplified-metrics-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
 }
diff --git a/simplified-metrics/build.gradle.kts b/simplified-metrics/build.gradle.kts
index cfc173c15..1c2f5e501 100644
--- a/simplified-metrics/build.gradle.kts
+++ b/simplified-metrics/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-metrics-api"))
 
     implementation(libs.firebase.analytics)
diff --git a/simplified-migration-api/build.gradle.kts b/simplified-migration-api/build.gradle.kts
index 3b5e7b825..391f0d0e1 100644
--- a/simplified-migration-api/build.gradle.kts
+++ b/simplified-migration-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-migration-spi"))
     implementation(project(":simplified-presentableerror-api"))
     implementation(project(":simplified-threads"))
diff --git a/simplified-migration-spi/build.gradle.kts b/simplified-migration-spi/build.gradle.kts
index 3a80da394..15aa9a5c0 100644
--- a/simplified-migration-spi/build.gradle.kts
+++ b/simplified-migration-spi/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-presentableerror-api"))
diff --git a/simplified-networkconnectivity-api/build.gradle.kts b/simplified-networkconnectivity-api/build.gradle.kts
index a2376764a..69844b9ad 100644
--- a/simplified-networkconnectivity-api/build.gradle.kts
+++ b/simplified-networkconnectivity-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
     implementation(libs.slf4j)
diff --git a/simplified-networkconnectivity/build.gradle.kts b/simplified-networkconnectivity/build.gradle.kts
index b4c60ab7f..df7fa911b 100644
--- a/simplified-networkconnectivity/build.gradle.kts
+++ b/simplified-networkconnectivity/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-networkconnectivity-api"))
 
     implementation(libs.kotlin.stdlib)
diff --git a/simplified-notifications/build.gradle.kts b/simplified-notifications/build.gradle.kts
index 31a5c33cf..684dd0d71 100644
--- a/simplified-notifications/build.gradle.kts
+++ b/simplified-notifications/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-profiles-api"))
diff --git a/simplified-oauth/build.gradle.kts b/simplified-oauth/build.gradle.kts
index 627107981..46d49fa51 100644
--- a/simplified-oauth/build.gradle.kts
+++ b/simplified-oauth/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.joda.time)
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
diff --git a/simplified-opds2-r2/build.gradle.kts b/simplified-opds2-r2/build.gradle.kts
index 57b2b60b2..01048cd3b 100644
--- a/simplified-opds2-r2/build.gradle.kts
+++ b/simplified-opds2-r2/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-opds2"))
     implementation(project(":simplified-opds2-parser-api"))
     implementation(project(":simplified-parser-api"))
diff --git a/simplified-profiles-api/build.gradle.kts b/simplified-profiles-api/build.gradle.kts
index 3bb1a6634..0d8e4220a 100644
--- a/simplified-profiles-api/build.gradle.kts
+++ b/simplified-profiles-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-feeds-api"))
diff --git a/simplified-profiles-controller-api/build.gradle.kts b/simplified-profiles-controller-api/build.gradle.kts
index 31037621c..4387b81ca 100644
--- a/simplified-profiles-controller-api/build.gradle.kts
+++ b/simplified-profiles-controller-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-books-api"))
diff --git a/simplified-profiles/build.gradle.kts b/simplified-profiles/build.gradle.kts
index 2ed94323e..604f457c3 100644
--- a/simplified-profiles/build.gradle.kts
+++ b/simplified-profiles/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-registry-api"))
diff --git a/simplified-reports/build.gradle.kts b/simplified-reports/build.gradle.kts
index 0168dd60c..355e7abea 100644
--- a/simplified-reports/build.gradle.kts
+++ b/simplified-reports/build.gradle.kts
@@ -19,6 +19,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.core)
     implementation(libs.commons.io)
     implementation(libs.kotlin.stdlib)
diff --git a/simplified-tenprint/build.gradle.kts b/simplified-tenprint/build.gradle.kts
index 9de9c0d29..a3adaab0b 100644
--- a/simplified-tenprint/build.gradle.kts
+++ b/simplified-tenprint/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.google.guava)
     implementation(libs.io7m.jnull)
 }
diff --git a/simplified-tests/build.gradle.kts b/simplified-tests/build.gradle.kts
index d95e401ed..14c5738a1 100644
--- a/simplified-tests/build.gradle.kts
+++ b/simplified-tests/build.gradle.kts
@@ -1,3 +1,4 @@
+
 android {
     packaging {
         jniLibs {
@@ -289,6 +290,8 @@ val dependencyObjects = listOf(
 )
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     for (dep in dependencyObjects) {
         implementation(dep)
         testImplementation(dep)
diff --git a/simplified-threads/build.gradle.kts b/simplified-threads/build.gradle.kts
index b36c455e7..319451640 100644
--- a/simplified-threads/build.gradle.kts
+++ b/simplified-threads/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.google.guava)
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
diff --git a/simplified-ui-accounts/build.gradle.kts b/simplified-ui-accounts/build.gradle.kts
index 44a0c1d19..9e77015e2 100644
--- a/simplified-ui-accounts/build.gradle.kts
+++ b/simplified-ui-accounts/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-registry-api"))
diff --git a/simplified-ui-announcements/build.gradle.kts b/simplified-ui-announcements/build.gradle.kts
index 7761edb8f..521857fa4 100644
--- a/simplified-ui-announcements/build.gradle.kts
+++ b/simplified-ui-announcements/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-announcements"))
diff --git a/simplified-ui-branding/build.gradle.kts b/simplified-ui-branding/build.gradle.kts
index 097e4908c..84cc046c0 100644
--- a/simplified-ui-branding/build.gradle.kts
+++ b/simplified-ui-branding/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
     implementation(libs.androidx.annotation)
diff --git a/simplified-ui-catalog/build.gradle.kts b/simplified-ui-catalog/build.gradle.kts
index 8ad1162b2..81052ea91 100644
--- a/simplified-ui-catalog/build.gradle.kts
+++ b/simplified-ui-catalog/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-adobe-extensions"))
diff --git a/simplified-ui-errorpage/build.gradle.kts b/simplified-ui-errorpage/build.gradle.kts
index 61c1f43ef..8de59682d 100644
--- a/simplified-ui-errorpage/build.gradle.kts
+++ b/simplified-ui-errorpage/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-android-ktx"))
     implementation(project(":simplified-presentableerror-api"))
     implementation(project(":simplified-reports"))
diff --git a/simplified-ui-images/build.gradle.kts b/simplified-ui-images/build.gradle.kts
index a75f98158..c971f39e7 100644
--- a/simplified-ui-images/build.gradle.kts
+++ b/simplified-ui-images/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-links"))
 
diff --git a/simplified-ui-listeners-api/build.gradle.kts b/simplified-ui-listeners-api/build.gradle.kts
index e5f4937e8..f7e817f76 100644
--- a/simplified-ui-listeners-api/build.gradle.kts
+++ b/simplified-ui-listeners-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core)
diff --git a/simplified-ui-navigation-tabs/build.gradle.kts b/simplified-ui-navigation-tabs/build.gradle.kts
index e759d2ba7..504149153 100644
--- a/simplified-ui-navigation-tabs/build.gradle.kts
+++ b/simplified-ui-navigation-tabs/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-registry-api"))
diff --git a/simplified-ui-onboarding/build.gradle.kts b/simplified-ui-onboarding/build.gradle.kts
index 48f23496e..6737660e4 100644
--- a/simplified-ui-onboarding/build.gradle.kts
+++ b/simplified-ui-onboarding/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-android-ktx"))
     implementation(project(":simplified-profiles-api"))
diff --git a/simplified-ui-screen/build.gradle.kts b/simplified-ui-screen/build.gradle.kts
index a2376764a..69844b9ad 100644
--- a/simplified-ui-screen/build.gradle.kts
+++ b/simplified-ui-screen/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
     implementation(libs.slf4j)
diff --git a/simplified-ui-settings/build.gradle.kts b/simplified-ui-settings/build.gradle.kts
index 50fc56151..b57c1c6cc 100644
--- a/simplified-ui-settings/build.gradle.kts
+++ b/simplified-ui-settings/build.gradle.kts
@@ -13,6 +13,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":palace-ui"))
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-accounts-api"))
diff --git a/simplified-ui-splash/build.gradle.kts b/simplified-ui-splash/build.gradle.kts
index f18111ff7..689516d34 100644
--- a/simplified-ui-splash/build.gradle.kts
+++ b/simplified-ui-splash/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-boot-api"))
     implementation(project(":simplified-buildconfig-api"))
     implementation(project(":simplified-documents"))
diff --git a/simplified-ui-thread-api/build.gradle.kts b/simplified-ui-thread-api/build.gradle.kts
index 2d536d0dd..630033385 100644
--- a/simplified-ui-thread-api/build.gradle.kts
+++ b/simplified-ui-thread-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
 }
diff --git a/simplified-ui-tutorial/build.gradle.kts b/simplified-ui-tutorial/build.gradle.kts
index 85e8105c0..8afe7c44d 100644
--- a/simplified-ui-tutorial/build.gradle.kts
+++ b/simplified-ui-tutorial/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-services-api"))
     implementation(project(":simplified-ui-listeners-api"))
     implementation(project(":simplified-ui-screen"))
diff --git a/simplified-viewer-api/build.gradle.kts b/simplified-viewer-api/build.gradle.kts
index 679637e6d..47b182687 100644
--- a/simplified-viewer-api/build.gradle.kts
+++ b/simplified-viewer-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-analytics-api"))
diff --git a/simplified-viewer-audiobook/build.gradle.kts b/simplified-viewer-audiobook/build.gradle.kts
index 0bacfe677..6486af162 100644
--- a/simplified-viewer-audiobook/build.gradle.kts
+++ b/simplified-viewer-audiobook/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-bookmarks-api"))
diff --git a/simplified-viewer-epub-readium2/build.gradle.kts b/simplified-viewer-epub-readium2/build.gradle.kts
index 40e76bb24..286123029 100644
--- a/simplified-viewer-epub-readium2/build.gradle.kts
+++ b/simplified-viewer-epub-readium2/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
diff --git a/simplified-viewer-pdf-pdfjs/build.gradle.kts b/simplified-viewer-pdf-pdfjs/build.gradle.kts
index 4cceae2ce..01f31a026 100644
--- a/simplified-viewer-pdf-pdfjs/build.gradle.kts
+++ b/simplified-viewer-pdf-pdfjs/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-bookmarks-api"))
diff --git a/simplified-viewer-preview/build.gradle.kts b/simplified-viewer-preview/build.gradle.kts
index c392a60a1..bac03a37f 100644
--- a/simplified-viewer-preview/build.gradle.kts
+++ b/simplified-viewer-preview/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-controller-api"))
diff --git a/simplified-viewer-spi/build.gradle.kts b/simplified-viewer-spi/build.gradle.kts
index 699f0ba06..baf8dc2c6 100644
--- a/simplified-viewer-spi/build.gradle.kts
+++ b/simplified-viewer-spi/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
 
     implementation(libs.irradia.mime.api)
diff --git a/simplified-webview/build.gradle.kts b/simplified-webview/build.gradle.kts
index b525962ed..a8230d9c4 100644
--- a/simplified-webview/build.gradle.kts
+++ b/simplified-webview/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-android-ktx"))