Refactor: Use core library desugaring instead of ThreeTenABP and android-restrostreeams

Author: zhanghai

app/build.gradle

@@ -56,6 +56,7 @@ android {
         generateLocaleConfig true
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -109,7 +110,7 @@ repositories {
     }
 }
 dependencies {
-    implementation('com.github.zhanghai:dav4jvm:c317607') {
+    implementation('com.github.bitfireAT:dav4jvm:c1bc143') {
         exclude group: 'org.ogce', module: 'xpp3'
     }
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
@@ -119,6 +120,8 @@ dependencies {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
+
     // kotlinx-coroutines-android depends on kotlin-stdlib-jdk8
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     def kotlinx_coroutines_version = '1.9.0'
@@ -159,7 +162,6 @@ dependencies {
     implementation ('com.hierynomus:sshj:0.35.0') {
         exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
     }
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.6'
     implementation 'com.leinardi.android:speed-dial:3.3.0'
     implementation ('com.rapid7.client:dcerpc:0.12.1') {
         // SMBJ-RPC depends on the JRE flavor of Guava which targets Java 8.
@@ -195,9 +197,8 @@ dependencies {
     implementation 'me.zhanghai.android.foregroundcompat:library:1.0.2'
     implementation 'me.zhanghai.android.libarchive:library:1.1.1'
     implementation 'me.zhanghai.android.libselinux:library:2.1.0'
-    implementation 'me.zhanghai.android.retrofile:library:1.1.1'
+    implementation 'me.zhanghai.android.retrofile:library:1.2.0'
     implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
-    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.4'
     implementation 'org.apache.ftpserver:ftpserver-core:1.2.0'
     // This is a dependency of org.apache.ftpserver:ftpserver-core but org.apache.mina:mina-core
     // 2.1.3+ became incompatible before API 24 due to dependency on StandardSocketOptions

app/src/main/java/me/zhanghai/android/files/app/AppInitializers.kt

@@ -8,7 +8,6 @@ package me.zhanghai.android.files.app
 import android.os.AsyncTask
 import android.os.Build
 import android.webkit.WebView
-import com.jakewharton.threetenabp.AndroidThreeTen
 import jcifs.context.SingletonContext
 import me.zhanghai.android.files.BuildConfig
 import me.zhanghai.android.files.coil.initializeCoil
@@ -31,9 +30,15 @@ import me.zhanghai.android.files.provider.smb.client.Client as SmbClient
 import me.zhanghai.android.files.provider.webdav.client.Client as WebDavClient
 
 val appInitializers = listOf(
-    ::initializeCrashlytics, ::disableHiddenApiChecks, ::initializeThreeTen,
-    ::initializeWebViewDebugging, ::initializeCoil, ::initializeFileSystemProviders, ::upgradeApp,
-    ::initializeLiveDataObjects, ::initializeCustomTheme, ::initializeNightMode,
+    ::initializeCrashlytics,
+    ::disableHiddenApiChecks,
+    ::initializeWebViewDebugging,
+    ::initializeCoil,
+    ::initializeFileSystemProviders,
+    ::upgradeApp,
+    ::initializeLiveDataObjects,
+    ::initializeCustomTheme,
+    ::initializeNightMode,
     ::createNotificationChannels
 )
 
@@ -47,10 +52,6 @@ private fun disableHiddenApiChecks() {
     HiddenApi.disableHiddenApiChecks()
 }
 
-private fun initializeThreeTen() {
-    AndroidThreeTen.init(application)
-}
-
 private fun initializeWebViewDebugging() {
     if (BuildConfig.DEBUG) {
         WebView.setWebContentsDebuggingEnabled(true)

app/src/main/java/me/zhanghai/android/files/compat/DateTimeCompat.kt

@@ -5,8 +5,8 @@
 
 package me.zhanghai.android.files.file
 
+import java.time.Instant
 import java8.nio.file.attribute.BasicFileAttributes
-import org.threeten.bp.Instant
 
 val BasicFileAttributes.fileSize: FileSize
     get() = size().asFileSize()

app/src/main/java/me/zhanghai/android/files/file/BasicFileAttributesExtensions.kt

@@ -6,6 +6,6 @@
 package me.zhanghai.android.files.file
 
 import android.text.format.DateUtils
-import org.threeten.bp.Duration
+import java.time.Duration
 
 fun Duration.format(): String = DateUtils.formatElapsedTime(seconds)

app/src/main/java/me/zhanghai/android/files/file/DurationExtensions.kt

@@ -8,10 +8,10 @@ package me.zhanghai.android.files.file
 import android.content.Context
 import android.text.format.DateUtils
 import android.text.format.Time
-import org.threeten.bp.Instant
-import org.threeten.bp.ZoneId
-import org.threeten.bp.format.DateTimeFormatter
-import org.threeten.bp.format.FormatStyle
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 
 /* @see com.android.documentsui.base.Shared#formatTime(Context, long) */
 @Suppress("DEPRECATION")

app/src/main/java/me/zhanghai/android/files/file/InstantExtensions.kt

@@ -6,13 +6,13 @@
 package me.zhanghai.android.files.fileproperties
 
 import android.media.MediaMetadataRetriever
-import me.zhanghai.android.files.util.takeIfNotBlank
-import org.threeten.bp.Instant
 import java.text.ParsePosition
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.util.Locale
 import java.util.TimeZone
 import kotlin.math.max
+import me.zhanghai.android.files.util.takeIfNotBlank
 
 fun MediaMetadataRetriever.extractMetadataNotBlank(keyCode: Int): String? =
     extractMetadata(keyCode)?.takeIfNotBlank()

app/src/main/java/me/zhanghai/android/files/fileproperties/MediaMetadataRetrieverExtensions.kt

@@ -5,7 +5,7 @@
 
 package me.zhanghai.android.files.fileproperties.audio
 
-import org.threeten.bp.Duration
+import java.time.Duration
 
 // @see com.android.providers.media.scan.ModernMediaScanner.scanItemAudio
 // @see com.android.documentsui.inspector.MediaView.showAudioData

app/src/main/java/me/zhanghai/android/files/fileproperties/audio/AudioInfo.kt

@@ -8,6 +8,7 @@ package me.zhanghai.android.files.fileproperties.audio
 import android.media.MediaMetadataRetriever
 import android.os.AsyncTask
 import android.os.Build
+import java.time.Duration
 import java8.nio.file.Path
 import me.zhanghai.android.files.compat.METADATA_KEY_SAMPLERATE
 import me.zhanghai.android.files.compat.use
@@ -19,7 +20,6 @@ import me.zhanghai.android.files.util.Stateful
 import me.zhanghai.android.files.util.Success
 import me.zhanghai.android.files.util.setDataSource
 import me.zhanghai.android.files.util.valueCompat
-import org.threeten.bp.Duration
 
 class AudioInfoLiveData(path: Path) : PathObserverLiveData<Stateful<AudioInfo>>(path) {
     init {

app/src/main/java/me/zhanghai/android/files/fileproperties/audio/AudioInfoLiveData.kt

@@ -7,12 +7,12 @@ package me.zhanghai.android.files.fileproperties.image
 
 import android.annotation.SuppressLint
 import androidx.exifinterface.media.ExifInterface
-import me.zhanghai.android.files.util.takeIfNotBlank
-import org.threeten.bp.Duration
-import org.threeten.bp.Instant
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZoneOffset
+import java.time.Duration
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZoneOffset
 import kotlin.math.roundToLong
+import me.zhanghai.android.files.util.takeIfNotBlank
 
 fun ExifInterface.getAttributeNotBlank(tag: String): String? =
     getAttribute(tag)?.takeIfNotBlank()