Merge pull request #566 from code-payments/chore/desugar-api-module

chore: desugar
code-payments · Sep 17, 2024 · e25a52f · e25a52f
2 parents 13d3b3c + 8e8aa50
commit e25a52f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/api/src/main/java/com/getcode/network/exchange/Exchange.kt b/api/src/main/java/com/getcode/network/exchange/Exchange.kt
@@ -1,17 +1,12 @@
 package com.getcode.network.exchange
 
-import android.annotation.SuppressLint
 import com.getcode.db.Database
 import com.getcode.model.Currency
 import com.getcode.model.CurrencyCode
 import com.getcode.model.PrefsString
 import com.getcode.model.Rate
-import com.getcode.network.api.CurrencyApi
-import com.getcode.network.core.NetworkOracle
 import com.getcode.network.repository.PrefRepository
-import com.getcode.network.service.ApiRateResult
 import com.getcode.network.service.CurrencyService
-import com.getcode.utils.ErrorUtils
 import com.getcode.utils.TraceType
 import com.getcode.utils.format
 import com.getcode.utils.network.retryable
@@ -26,17 +21,10 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.datetime.Instant
-import timber.log.Timber
 import java.util.Date
 import javax.inject.Inject
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.time.Duration.Companion.convert
 import kotlin.time.Duration.Companion.minutes
-import kotlin.time.DurationUnit
-import kotlin.time.ExperimentalTime
 
 interface Exchange {
     val localRate: Rate

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -88,6 +88,7 @@ android {
     compileOptions {
         sourceCompatibility(Versions.java)
         targetCompatibility(Versions.java)
+        isCoreLibraryDesugaringEnabled = true
     }
 
     java {
@@ -122,6 +123,8 @@ dependencies {
     implementation(project(":common:theme"))
     implementation(project(":vendor:tipkit:tipkit-m2"))
 
+    coreLibraryDesugaring(Libs.android_desugaring)
+
     //standard libraries
     implementation(Libs.kotlinx_collections_immutable)
     implementation(Libs.kotlinx_serialization_json)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -91,6 +91,8 @@ object Versions {
     const val protobuf_plugin = "0.9.4"
 
     const val sodium_bindings = "0.9.0"
+
+    const val desugaring = "2.1.2"
 }
 
 object Classpath {
@@ -134,6 +136,7 @@ object Plugins {
 }
 
 object Libs {
+    const val android_desugaring = "com.android.tools:desugar_jdk_libs:${Versions.desugaring}"
     const val androidx_activity = "androidx.activity:activity-ktx:{${Versions.androidx_activity}"
     const val androidx_annotation = "androidx.annotation:annotation:${Versions.androidx_annotation}"
     const val androidx_biometrics = "androidx.biometric:biometric:${Versions.androidx_biometrics}"