Merge pull request #223 from lihenggui/mercury

Upgrade accompanist to 0.31.5-beta
lihenggui · Jul 12, 2023 · ed6473c · ed6473c
2 parents b7cd04f + 4468319
commit ed6473c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app-compose/build.gradle.kts b/app-compose/build.gradle.kts
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         applicationId = "com.merxury.blocker"
         val gitCommitCount = providers.exec {
-            commandLine("git", "rev-list", "--all", "--count")
+            commandLine("git", "rev-list", "--count", "HEAD")
         }.standardOutput.asText.get().trim()
         versionCode = gitCommitCount.toIntOrNull() ?: 1
         versionName = "2.0.$gitCommitCount" // X.Y.Z; X = Major, Y = minor, Z = version code

diff --git a/...e/appdetail/src/main/java/com/merxury/blocker/feature/appdetail/summary/SummaryContent.kt b/...e/appdetail/src/main/java/com/merxury/blocker/feature/appdetail/summary/SummaryContent.kt
@@ -40,6 +40,7 @@ import kotlinx.datetime.Instant
 import kotlinx.datetime.toJavaInstant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
 import java.util.Locale
 
 @Composable
@@ -107,7 +108,7 @@ fun AppSummary(
         )
         BlockerSettingItem(
             title = stringResource(id = string.last_update_time),
-            summary = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+            summary = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
                 .withLocale(Locale.getDefault())
                 .withZone(ZoneId.systemDefault())
                 .format(lastUpdateTime?.toJavaInstant()),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-accompanist = "0.30.1"
+accompanist = "0.31.5-beta"
 androidDesugarJdkLibs = "2.0.3"
 androidGradlePlugin = "8.2.0-alpha11"
 androidxActivity = "1.7.2"