Skip to content

Commit 61b3c50

Browse files
committed
chore: update dependencies; migrate from kotlinx.datetime to kotlin.time where needed
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 47bdad3 commit 61b3c50

15 files changed

Lines changed: 41 additions & 42 deletions

File tree

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.getcode.opencode.model.core.ID
44
import com.getcode.opencode.model.financial.LocalFiat
55
import com.getcode.opencode.model.financial.Token
66
import com.getcode.solana.keys.PublicKey
7-
import kotlinx.datetime.Instant
87
import kotlinx.serialization.Serializable
98
import kotlinx.serialization.json.Json
9+
import kotlin.time.Instant
1010

1111
data class ActivityFeedMessageWithToken(
1212
val message: ActivityFeedMessage,

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItem.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import androidx.compose.animation.core.animateDpAsState
55
import androidx.compose.animation.slideInVertically
66
import androidx.compose.animation.slideOutVertically
77
import androidx.compose.animation.togetherWith
8-
import androidx.compose.foundation.background
9-
import androidx.compose.foundation.layout.Box
108
import androidx.compose.foundation.layout.Column
119
import androidx.compose.foundation.layout.Spacer
1210
import androidx.compose.foundation.layout.fillMaxWidth
@@ -33,7 +31,7 @@ import com.getcode.opencode.model.financial.toFiat
3331
import com.getcode.opencode.model.financial.usdf
3432
import com.getcode.theme.CodeTheme
3533
import com.getcode.utils.decodeBase58
36-
import kotlinx.datetime.Instant
34+
import kotlin.time.Instant
3735

3836
@Composable
3937
internal fun FeedItem(

apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItemSummary.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.getcode.ui.core.addIf
1919
import com.getcode.ui.core.noRippleClickable
2020
import com.getcode.util.format
2121
import com.getcode.util.formatLocalized
22-
import kotlinx.datetime.Instant
22+
import kotlin.time.Instant
2323

2424

2525
@Composable

apps/flipcash/shared/persistence/sources/src/main/kotlin/com/flipcash/app/persistence/sources/mapper/notifications/MessageEntityToFeedMessageMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.getcode.opencode.model.financial.Fiat
1010
import com.getcode.opencode.model.financial.LocalFiat
1111
import com.getcode.opencode.model.financial.Rate
1212
import com.getcode.solana.keys.Mint
13-
import kotlinx.datetime.Instant
1413
import javax.inject.Inject
14+
import kotlin.time.Instant
1515

1616
class MessageEntityToFeedMessageMapper @Inject constructor() : Mapper<MessageEntity, ActivityFeedMessage> {
1717
override fun map(from: MessageEntity): ActivityFeedMessage {

gradle/libs.versions.toml

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
[versions]
22
java = "21"
3-
kotlin = "2.3.10"
3+
kotlin = "2.3.20"
44
ksp = "2.3.6"
55
kotlinx-coroutines = "1.10.2"
66
kotlinx-serialization = "1.10.0"
77
kotlinx-datetime = "0.7.1"
88

9-
kover = "0.9.1"
9+
kover = "0.9.8"
1010
agp = "8.9.3"
1111
google-services = "4.4.4"
1212

1313
androidx-appcompat = "1.7.1"
14-
androidx-activity = "1.12.4"
14+
androidx-activity = "1.13.0"
1515
androidx-annotation = "1.9.1"
16-
androidx-biometrics = "1.4.0-alpha05"
17-
androidx-camerax = "1.5.3"
16+
androidx-biometrics = "1.4.0-alpha06"
17+
androidx-camerax = "1.6.0"
1818
androidx-credentials = "1.5.0"
19-
androidx-core = "1.17.0"
20-
androidx-datastore = "1.2.0"
19+
androidx-core = "1.18.0"
20+
androidx-datastore = "1.2.1"
2121
androidx-lifecycle = "2.10.0"
2222
androidx-navigation = "2.9.7"
2323
navigation3 = "1.0.1"
2424
navigation3-lifecycle = "2.10.0"
25-
androidx-browser = "1.9.0"
26-
androidx-paging = "3.4.1"
25+
androidx-browser = "1.10.0"
26+
androidx-paging = "3.4.2"
2727
androidx-room = "2.8.4"
28-
androidx-work = "2.11.1"
29-
androidx-webkit = "1.14.0"
30-
androidx-ui = "1.10.5"
28+
androidx-work = "2.11.2"
29+
androidx-webkit = "1.15.0"
30+
androidx-ui = "1.10.6"
3131

3232
sqlcipher = "4.5.4"
3333

34-
compose-bom = "2026.02.01"
35-
compose-activities = "1.12.4"
34+
compose-bom = "2026.03.01"
35+
compose-activities = "1.13.0"
3636
compose-view-models = "2.10.0"
3737
compose-paging = "3.4.2"
3838
compose-webview = "2.0.3"
@@ -49,7 +49,7 @@ rxandroid = "3.0.2"
4949
kin-sdk = "2.1.2"
5050
grpc-android = "1.79.0"
5151
slf4j = "1.7.36"
52-
firebase-bom = "34.10.0"
52+
firebase-bom = "34.11.0"
5353
crashlytics-gradle = "3.0.6"
5454
play-service-ml-barcode = "18.3.1"
5555
google-play-billing = "8.3.0"
@@ -61,21 +61,21 @@ grpc-kotlin = "1.5.0"
6161
protobuf = "4.34.0"
6262
protobuf-plugin = "0.9.6"
6363

64-
lib-phone-number-port = "9.0.24"
65-
lib-phone-number-google = "9.0.25"
64+
lib-phone-number-port = "9.0.27"
65+
lib-phone-number-google = "9.0.27"
6666
zxing = "3.5.4"
6767

6868
androidx-test-runner = "1.7.0"
6969
junit = "4.13.2"
7070
androidx-junit = "1.3.0"
7171
espresso = "3.7.0"
72-
mockito-kotlin = "5.4.0"
73-
mockk = "1.13.16"
74-
turbine = "1.2.0"
75-
robolectric = "4.14.1"
72+
mockito-kotlin = "6.3.0"
73+
mockk = "1.14.9"
74+
turbine = "1.2.1"
75+
robolectric = "4.16"
7676
slf4j-simple = "2.0.17"
7777
androidxUiJUnit = "1.10.6"
78-
mixpanel = "8.3.0"
78+
mixpanel = "8.4.0"
7979

8080
timber = "5.0.1"
8181
voyager = "1.1.0-beta03"
@@ -87,17 +87,17 @@ solana-mwa = "2.1.0"
8787

8888
bugsnag = "6.25.0"
8989
bugsnag-agp = "8.2.0"
90-
bugsnag-gradle-plugin = "1.0.0"
90+
bugsnag-gradle-plugin = "1.1.0"
9191

92-
rinku = "1.5.0"
92+
rinku = "1.6.0"
9393
haze = "1.7.2"
9494
cloudy = "0.5.0"
9595
vico = "2.4.1"
9696

9797
androidxTestRules = "1.7.0"
9898
archCore = "2.2.0"
9999

100-
screenshot = "0.0.1-alpha13"
100+
screenshot = "0.0.1-alpha14"
101101

102102
secrets-gradle-plugin = "2.0.1"
103103
versioning-gradle-plugin = "2.4.0"
@@ -135,7 +135,9 @@ androidx-room-rxjava3 = { module = "androidx.room:room-rxjava3", version.ref = "
135135
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
136136
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
137137
androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "androidx-room" }
138+
androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
138139
androidx-work = { module = "androidx.work:work-runtime", version.ref = "androidx-work" }
140+
androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
139141
androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
140142
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling-android", version.ref = "androidx-ui" }
141143
androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "androidx-webkit" }

libs/datetime/src/main/kotlin/com/getcode/util/Instant.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.getcode.util
22

33
import kotlinx.datetime.DatePeriod
44
import kotlinx.datetime.DateTimeUnit
5-
import kotlinx.datetime.Instant
65
import kotlinx.datetime.LocalDate
76
import kotlinx.datetime.TimeZone
87
import kotlinx.datetime.atStartOfDayIn
@@ -12,6 +11,7 @@ import kotlinx.datetime.toLocalDateTime
1211
import java.text.SimpleDateFormat
1312
import java.util.Date
1413
import java.util.Locale
14+
import kotlin.time.Instant
1515

1616
fun Instant.toLocalDate(timeZone: TimeZone = TimeZone.currentSystemDefault()) =
1717
toLocalDateTime(timeZone).date

ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ import com.getcode.ui.components.text.markup.Markup
7575
import com.getcode.ui.components.user.social.SenderNameDisplay
7676
import com.getcode.ui.core.noRippleClickable
7777
import com.getcode.util.vibration.LocalVibrator
78-
import kotlinx.datetime.Instant
7978
import kotlin.math.roundToInt
8079
import kotlin.reflect.KClass
80+
import kotlin.time.Instant
8181

8282
object MessageNodeDefaults {
8383

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/DateWithStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.getcode.ui.components.R
2525
import com.getcode.ui.components.chat.MessageNodeDefaults
2626
import com.getcode.util.formatTimeRelatively
2727
import kotlin.time.Clock
28-
import kotlinx.datetime.Instant
28+
import kotlin.time.Instant
2929

3030
object DateWithStatusDefaults {
3131
val DateTextStyle: TextStyle

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/DeletedMessage.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.ui.text.buildAnnotatedString
1616
import androidx.compose.ui.text.font.FontStyle
1717
import androidx.compose.ui.text.font.FontWeight
1818
import androidx.compose.ui.unit.dp
19-
import com.getcode.model.ID
2019
import com.getcode.model.chat.Deleter
2120
import com.getcode.model.chat.MessageStatus
2221
import com.getcode.model.chat.Sender
@@ -25,7 +24,7 @@ import com.getcode.ui.components.R
2524
import com.getcode.ui.components.chat.MessageNodeDefaults
2625
import com.getcode.ui.components.chat.MessageNodeOptions
2726
import com.getcode.ui.components.chat.MessageNodeScope
28-
import kotlinx.datetime.Instant
27+
import kotlin.time.Instant
2928

3029
@Composable
3130
internal fun MessageNodeScope.DeletedMessage(

ui/components/src/main/kotlin/com/getcode/ui/components/chat/messagecontents/EncryptedContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import androidx.compose.ui.res.painterResource
1313
import com.getcode.theme.CodeTheme
1414
import com.getcode.ui.components.R
1515
import com.getcode.util.formatTimeRelatively
16-
import kotlinx.datetime.Instant
16+
import kotlin.time.Instant
1717

1818
@Composable
1919
internal fun EncryptedContent(modifier: Modifier = Modifier, date: Instant) {

0 commit comments

Comments
 (0)