desugar with api 21 test

.github/workflows/Build.yaml

@@ -153,7 +153,7 @@ jobs:
  timeout-minutes: 55
  strategy:
  matrix:
- api-level: [26, 30]
+ api-level: [21, 26, 30]
 
  steps:
  - name: Delete unnecessary tools 🔧

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

@@ -22,7 +22,6 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.provideDelegate
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
@@ -47,15 +46,10 @@ internal fun Project.configureKotlinAndroid(
  // https://developer.android.com/studio/write/java11-minimal-support-table
  sourceCompatibility = JavaVersion.VERSION_11
  targetCompatibility = JavaVersion.VERSION_11
- isCoreLibraryDesugaringEnabled = true
  }
  }
 
  configureKotlin<KotlinAndroidProjectExtension>()
-
- dependencies {
- add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
- }
 }
 
 /**

core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt

@@ -17,6 +17,7 @@
 package com.google.samples.apps.nowinandroid.core.network.demo
 
 import JvmUnitTestDemoAssetManager
+import android.os.Build
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
 import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource
@@ -28,7 +29,12 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
+import okio.use
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+import java.nio.charset.StandardCharsets
 import javax.inject.Inject
+import kotlin.coroutines.coroutineContext
 
 /**
  * [NiaNetworkDataSource] implementation that provides static news resources to aid development
@@ -42,13 +48,27 @@ class DemoNiaNetworkDataSource @Inject constructor(
  @OptIn(ExperimentalSerializationApi::class)
  override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =
  withContext(ioDispatcher) {
- assets.open(TOPICS_ASSET).use(networkJson::decodeFromStream)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ assets.open(TOPICS_ASSET).use(networkJson::decodeFromStream)
+ } else {
+ // Use decodeFromString to capability with API 24 below.
+ // https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342
+ val topicsJsonString = convertStreamToString(assets.open(TOPICS_ASSET))
+ networkJson.decodeFromString(topicsJsonString)
+ }
  }
 
  @OptIn(ExperimentalSerializationApi::class)
  override suspend fun getNewsResources(ids: List<String>?): List<NetworkNewsResource> =
  withContext(ioDispatcher) {
- assets.open(NEWS_ASSET).use(networkJson::decodeFromStream)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ assets.open(NEWS_ASSET).use(networkJson::decodeFromStream)
+ } else {
+ // Use decodeFromString to capability with API 24 below.
+ // https://github.com/Kotlin/kotlinx.serialization/issues/2457#issuecomment-1786923342
+ val newsJsonString = convertStreamToString(assets.open(NEWS_ASSET))
+ networkJson.decodeFromString(newsJsonString)
+ }
  }
 
  override suspend fun getTopicChangeList(after: Int?): List<NetworkChangeList> =
@@ -57,6 +77,24 @@ class DemoNiaNetworkDataSource @Inject constructor(
  override suspend fun getNewsResourceChangeList(after: Int?): List<NetworkChangeList> =
  getNewsResources().mapToChangeList(NetworkNewsResource::id)
 
+ /**
+ * Convert [InputStream] to [String].
+ */
+ private suspend fun convertStreamToString(inputStream: InputStream): String = withContext(
+ coroutineContext,
+ ) {
+ val result = ByteArrayOutputStream()
+ val buffer = ByteArray(1024)
+ var length = 0
+ while (true) {
+ length = inputStream.read(buffer)
+ if (length == -1) break
+ result.write(buffer, 0, length)
+ }
+
+ result.toString(StandardCharsets.UTF_8.name())
+ }
+
  companion object {
  private const val NEWS_ASSET = "news.json"
  private const val TOPICS_ASSET = "topics.json"

core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt

@@ -67,10 +67,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
 import kotlinx.datetime.Instant
-import kotlinx.datetime.toJavaInstant
-import kotlinx.datetime.toJavaZoneId
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
+import java.text.DateFormat
 import java.util.Locale
 
 /**
@@ -240,11 +237,9 @@ fun NotificationDot(
 }
 
 @Composable
-fun dateFormatted(publishDate: Instant): String = DateTimeFormatter
- .ofLocalizedDate(FormatStyle.MEDIUM)
- .withLocale(Locale.getDefault())
- .withZone(LocalTimeZone.current.toJavaZoneId())
- .format(publishDate.toJavaInstant())
+fun dateFormatted(publishDate: Instant): String = DateFormat
+ .getDateInstance(DateFormat.MEDIUM, Locale.getDefault())
+ .format(publishDate.toEpochMilliseconds())
 
 @Composable
 fun NewsResourceMetaData(

gradle/libs.versions.toml

@@ -1,6 +1,5 @@
 [versions]
 accompanist = "0.34.0"
-androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
 androidGradlePlugin = "8.4.0"
 androidTools = "31.4.0"
@@ -63,7 +62,6 @@ turbine = "1.1.0"
 
 [libraries]
 accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
-android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }
 androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }