From abaff72304f6a4107c9e21f14bddba5852ac63bf Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 9 Sep 2024 01:55:35 -0700
Subject: [PATCH] Enable core library desugaring

Fix #8343
---
 app/apk/build.gradle.kts  | 5 +++++
 gradle/libs.versions.toml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/apk/build.gradle.kts b/app/apk/build.gradle.kts
index 99f550f66..b474f9c7b 100644
--- a/app/apk/build.gradle.kts
+++ b/app/apk/build.gradle.kts
@@ -42,10 +42,15 @@ android {
     buildFeatures {
         dataBinding = true
     }
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
 }
 
 dependencies {
     implementation(project(":app:core"))
+    coreLibraryDesugaring(libs.jdk.libs)
 
     implementation(libs.indeterminate.checkbox)
     implementation(libs.rikka.layoutinflater)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 42a89e0a3..8dedc95dd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,6 +44,7 @@ transition = { module = "androidx.transition:transition", version = "1.5.1" }
 collection-ktx = { module = "androidx.collection:collection-ktx", version = "1.4.3" }
 lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.8.5" }
 material = { module = "com.google.android.material:material", version = "1.12.0" }
+jdk-libs = { module = "com.android.tools:desugar_jdk_libs_nio", version = "2.1.2" }
 
 # topjohnwu
 indeterminate-checkbox = { module = "com.github.topjohnwu:indeterminate-checkbox", version = "1.0.7" }