From c8cfaeecf6db8292adb87833fbbc9fde6338316c Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:31:16 +0800
Subject: [PATCH] Clean up `java.nio` APIs usage to avoid desugaring

---
 app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt | 5 ++---
 gradle/libs.versions.toml                                  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt
index cf6d3df62..90781cb21 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/spider/SpiderDen.kt
@@ -60,7 +60,6 @@ import io.ktor.utils.io.copyTo
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
 import kotlin.concurrent.write
-import kotlin.io.path.readText
 import kotlinx.coroutines.CancellationException
 import okio.Path
 
@@ -254,7 +253,7 @@ class SpiderDen(val info: GalleryInfo) {
 
     fun getExtension(index: Int): String? {
         val key = getImageKey(gid, index)
-        return sCache.read(key) { metadata.toNioPath().readText() }
+        return sCache.read(key) { metadata.toFile().readText() }
             ?: findImageFile(index)?.name.let { FileUtils.getExtensionFromFilename(it) }
     }
 
@@ -266,7 +265,7 @@ class SpiderDen(val info: GalleryInfo) {
                 return object : PathSource, AutoCloseable by snapshot {
                     override val source = snapshot.data
                     override val type by lazy {
-                        snapshot.metadata.toNioPath().readText()
+                        snapshot.metadata.toFile().readText()
                     }
                 }
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d55919688..f77d05bc4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -83,7 +83,7 @@ compose-destinations-compiler = { module = "io.github.raamcosta.compose-destinat
 material-motion-core = "io.github.fornewid:material-motion-compose-core:2.0.1"
 material-kolor = "com.materialkolor:material-kolor:2.0.0"
 
-desugar = "com.android.tools:desugar_jdk_libs_nio:2.1.2"
+desugar = "com.android.tools:desugar_jdk_libs:2.1.2"
 
 diff = "io.github.petertrr:kotlin-multiplatform-diff:0.7.0"
 jsoup = "org.jsoup:jsoup:1.18.1"