Skip to content

Commit b2341ae

Browse files
committed
chore: update dependencies; drop org.kin dependency
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent 02ada90 commit b2341ae

44 files changed

Lines changed: 177 additions & 163 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/flipcash/app/build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,16 @@ android {
9797
}
9898

9999
packaging {
100-
resources.excludes += setOf("**/*.proto", "META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
100+
resources.excludes += setOf("**/*.proto", "META-INF/LICENSE.md", "META-INF/LICENSE-notice.md", "META-INF/versions/9/OSGI-INF/MANIFEST.MF")
101101
}
102102
}
103103

104+
configurations.all {
105+
// protobuf-javalite 4.x already includes well-known types, making
106+
// Firebase's protolite-well-known-types redundant and conflicting.
107+
exclude(group = "com.google.firebase", module = "protolite-well-known-types")
108+
}
109+
104110
versioning {
105111
excludeBuildTypes = "debug"
106112
keepOriginalBundleFile = true

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.launchIn
2020
import kotlinx.coroutines.flow.map
2121
import kotlinx.coroutines.flow.mapNotNull
2222
import kotlinx.coroutines.flow.onEach
23-
import org.kin.sdk.base.tools.Base58
23+
import com.getcode.vendor.Base58
2424
import javax.inject.Inject
2525

2626
@HiltViewModel

apps/flipcash/shared/accesskey/src/main/kotlin/com/flipcash/app/accesskey/BaseAccessKeyViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import kotlinx.coroutines.flow.take
4141
import kotlinx.coroutines.flow.update
4242
import kotlinx.coroutines.launch
4343
import kotlinx.coroutines.withContext
44-
import org.kin.sdk.base.tools.Base58
44+
import com.getcode.vendor.Base58
4545
import java.text.DateFormat
4646
import java.text.SimpleDateFormat
4747
import java.util.Date

apps/flipcash/shared/google-play-billing/src/main/kotlin/com/flipcash/app/billing/internal/GooglePlayBillingClient.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import com.getcode.utils.SuppressibleException
5252
import com.getcode.utils.TraceType
5353
import com.getcode.utils.network.retryable
5454
import com.getcode.utils.trace
55-
import com.google.common.collect.ImmutableList
5655
import dagger.hilt.android.qualifiers.ApplicationContext
5756
import kotlin.coroutines.resume
5857
import kotlin.math.pow
@@ -204,7 +203,7 @@ internal class GooglePlayBillingClient(
204203

205204
val billingFlowParams = BillingFlowParams.newBuilder()
206205
.setProductDetailsParamsList(
207-
ImmutableList.of(
206+
listOf(
208207
BillingFlowParams.ProductDetailsParams.newBuilder()
209208
.setProductDetails(details)
210209
.build()
@@ -354,7 +353,7 @@ internal class GooglePlayBillingClient(
354353
suspendCancellableCoroutine { cont ->
355354
val queryProductDetailsParams = QueryProductDetailsParams.newBuilder()
356355
.setProductList(
357-
ImmutableList.of(
356+
listOf(
358357
QueryProductDetailsParams.Product.newBuilder()
359358
.setProductId(productId)
360359
.setProductType(ProductType.INAPP)

apps/flipcash/shared/persistence/db/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ dependencies {
2626
implementation(project(":libs:models"))
2727
implementation(project(":libs:encryption:base58"))
2828
implementation(project(":libs:encryption:utils"))
29-
implementation(project(":libs:crypto:kin"))
3029

3130
implementation(project(":services:flipcash"))
3231
}

apps/flipcash/shared/persistence/db/src/main/kotlin/com/flipcash/app/persistence/FlipcashDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.flipcash.app.persistence.entities.TokenValuationEntity
2121
import com.getcode.utils.TraceType
2222
import com.getcode.utils.trace
2323
import com.getcode.vendor.Base58
24-
import org.kin.sdk.base.tools.subByteArray
24+
import com.getcode.utils.subByteArray
2525

2626
@Database(
2727
entities = [

apps/flipcash/shared/persistence/sources/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929

3030
implementation(project(":libs:encryption:base58"))
3131
implementation(project(":libs:encryption:utils"))
32-
implementation(project(":libs:crypto:kin"))
3332

3433
implementation(project(":services:flipcash"))
3534
}

gradle/libs.versions.toml

Lines changed: 61 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,94 @@
11
[versions]
22
java = "21"
3-
kotlin = "2.2.21"
4-
ksp = "2.2.21-2.0.4"
3+
kotlin = "2.3.10"
4+
ksp = "2.3.4"
55
kotlinx-coroutines = "1.10.2"
6-
kotlinx-serialization = "1.9.0"
6+
kotlinx-serialization = "1.10.0"
77
kotlinx-datetime = "0.7.1"
88

9-
agp = "8.9.1"
10-
google-services = "4.4.2"
9+
agp = "8.9.3"
10+
google-services = "4.4.4"
1111

12-
androidx-appcompat = "1.7.0"
13-
androidx-activity = "1.7.2"
14-
androidx-annotation = "1.7.1"
12+
androidx-appcompat = "1.7.1"
13+
androidx-activity = "1.12.4"
14+
androidx-annotation = "1.9.1"
1515
androidx-biometrics = "1.2.0-alpha05"
16-
androidx-camerax = "1.4.2"
16+
androidx-camerax = "1.5.3"
1717
androidx-credentials = "1.5.0"
18-
androidx-core = "1.13.1"
19-
androidx-constraint-layout = "2.1.3"
20-
androidx-datastore = "1.1.7"
21-
androidx-lifecycle = "2.7.0"
22-
androidx-navigation = "2.8.0"
23-
androidx-browser = "1.4.0"
24-
androidx-paging = "3.2.1"
25-
androidx-room = "2.7.1"
26-
androidx-work = "2.10.1"
27-
androidx-ui = "1.10.3"
28-
29-
sqlcipher = "4.5.1"
30-
31-
compose-bom = "2025.12.01"
32-
compose-activities = "1.12.2"
33-
compose-view-models = "2.6.2"
34-
compose-navigation = "2.9.1"
35-
compose-paging = "3.3.6"
18+
androidx-core = "1.17.0"
19+
androidx-datastore = "1.2.0"
20+
androidx-lifecycle = "2.10.0"
21+
androidx-navigation = "2.9.7"
22+
androidx-browser = "1.9.0"
23+
androidx-paging = "3.4.1"
24+
androidx-room = "2.8.4"
25+
androidx-work = "2.11.1"
26+
androidx-ui = "1.10.4"
27+
28+
sqlcipher = "4.5.4"
29+
30+
compose-bom = "2026.02.01"
31+
compose-activities = "1.12.4"
32+
compose-view-models = "2.10.0"
33+
compose-paging = "3.4.1"
3634
compose-webview = "0.33.6"
37-
compose-accompanist = "0.24.2-alpha"
38-
compose-coil = "3.0.0"
39-
40-
hilt = "2.57.2"
41-
hilt-jetpack = "1.2.0"
42-
okhttp = "4.12.0"
43-
retrofit = "2.11.0"
44-
rxjava = "3.1.3"
45-
rxandroid = "3.0.0"
46-
47-
kin-sdk = "1.0.1"
48-
grpc-android = "1.33.1"
49-
slf4j = "1.7.25"
50-
firebase-bom = "34.4.0"
51-
crashlytics-gradle = "3.0.2"
52-
play-service-auth = "21.4.0"
53-
play-service-auth-phone = "18.3.0"
35+
compose-accompanist = "0.36.0"
36+
compose-coil = "3.4.0"
37+
38+
hilt = "2.58"
39+
hilt-jetpack = "1.3.0"
40+
okhttp = "5.3.2"
41+
retrofit = "3.0.0"
42+
rxjava = "3.1.12"
43+
rxandroid = "3.0.2"
44+
45+
kin-sdk = "2.1.2"
46+
grpc-android = "1.79.0"
47+
slf4j = "1.7.36"
48+
firebase-bom = "34.10.0"
49+
crashlytics-gradle = "3.0.6"
5450
play-service-ml-barcode = "18.3.1"
55-
google-play-billing = "8.0.0"
51+
google-play-billing = "8.3.0"
5652
google-play-updates = "2.1.0"
5753

58-
grpc = "1.62.2"
59-
grpc-okhttp = "1.33.1"
60-
grpc-kotlin = "1.4.1"
61-
protobuf = "3.25.3"
62-
protobuf-plugin = "0.9.4"
54+
grpc = "1.79.0"
55+
grpc-okhttp = "1.79.0"
56+
grpc-kotlin = "1.5.0"
57+
protobuf = "4.34.0"
58+
protobuf-plugin = "0.9.6"
6359

64-
mp-android-chart = "v3.1.0"
65-
lib-phone-number-port = "8.12.43"
66-
lib-phone-number-google = "8.12.54"
67-
zxing = "3.3.2"
60+
lib-phone-number-port = "9.0.24"
61+
lib-phone-number-google = "9.0.25"
62+
zxing = "3.5.4"
6863

69-
androidx-test-runner = "1.4.0"
70-
junit = "4.13.1"
71-
androidx-junit = "1.1.3"
72-
espresso = "3.4.0"
73-
mixpanel = "8.2.4"
64+
androidx-test-runner = "1.7.0"
65+
junit = "4.13.2"
66+
androidx-junit = "1.3.0"
67+
espresso = "3.7.0"
68+
mixpanel = "8.3.0"
7469

75-
markwon = "4.6.2"
7670
timber = "5.0.1"
7771
voyager = "1.1.0-beta03"
7872

7973
sodium-bindings = "0.9.5"
80-
desugaring = "2.1.2"
74+
desugaring = "2.1.5"
8175
event-bus = "0.1.0"
82-
solana-mwa = "2.0.3"
76+
solana-mwa = "2.1.0"
8377

84-
bugsnag = "6.19.0"
78+
bugsnag = "6.25.0"
8579
bugsnag-agp = "8.2.0"
8680
bugsnag-gradle-plugin = "1.0.0"
8781

8882
rinku = "1.5.0"
89-
haze = "1.7.1"
90-
cloudy = "0.2.7"
83+
haze = "1.7.2"
84+
cloudy = "0.5.0"
9185
vico = "2.4.1"
9286

9387
screenshot = "0.0.1-alpha13"
9488

9589
secrets-gradle-plugin = "2.0.1"
9690
versioning-gradle-plugin = "2.4.0"
97-
firebase-perf-plugin = "1.4.2"
91+
firebase-perf-plugin = "2.0.2"
9892

9993
[libraries]
10094
# Desugaring
@@ -110,8 +104,6 @@ androidx-camerax-camera2 = { module = "androidx.camera:camera-camera2", version.
110104
androidx-camerax-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camerax" }
111105
androidx-camerax-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camerax" }
112106
androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
113-
androidx-constraint-layout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraint-layout" }
114-
androidx-constraint-layout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.0.1" }
115107
androidx-credentials = { module = "androidx.credentials:credentials", version.ref = "androidx-credentials" }
116108
androidx-credentials-play-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "androidx-credentials" }
117109
androidx-localbroadcastmanager = { module = "androidx.localbroadcastmanager:localbroadcastmanager", version = "1.0.0" }
@@ -130,7 +122,6 @@ androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "an
130122
androidx-work = { module = "androidx.work:work-runtime", version.ref = "androidx-work" }
131123
androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
132124
androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling-android", version.ref = "androidx-ui" }
133-
androidx-webkit = { module = "androidx.webkit:webkit", version = "1.14.0" }
134125

135126
sqlcipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "sqlcipher" }
136127

@@ -147,13 +138,11 @@ hilt-worker = { module = "androidx.hilt:hilt-work", version.ref = "hilt-jetpack"
147138
hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
148139
hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt-jetpack" }
149140
hilt-android-test = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
150-
hilt-nav-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-jetpack" }
151141

152142
# Kotlin
153143
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
154144
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
155145
kotlinx-coroutines-rx3 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" }
156-
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
157146
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.6" }
158147
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
159148
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
@@ -180,8 +169,6 @@ compose-material-icons-core = { module = "androidx.compose.material:material-ico
180169
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended-android" }
181170
compose-activities = { module = "androidx.activity:activity-compose", version.ref = "compose-activities" }
182171
compose-view-models = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "compose-view-models" }
183-
compose-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
184-
compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
185172
compose-paging = { module = "androidx.paging:paging-compose", version.ref = "compose-paging" }
186173
compose-webview = { module = "io.github.kevinnzou:compose-webview", version.ref = "compose-webview" }
187174

@@ -201,7 +188,6 @@ slf4j = { module = "org.slf4j:slf4j-android", version.ref = "slf4j" }
201188
grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpc-android" }
202189
grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "grpc-okhttp" }
203190
grpc-kotlin = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpc-kotlin" }
204-
grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
205191
grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" }
206192
grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
207193
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
@@ -221,9 +207,7 @@ firebase-installations = { module = "com.google.firebase:firebase-installations"
221207
firebase-perf = { module = "com.google.firebase:firebase-perf" }
222208

223209
# Google Play Services
224-
play-integrity = { module = "com.google.android.play:integrity", version = "1.3.0" }
225-
play-service-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "play-service-auth" }
226-
play-service-auth-phone = { module = "com.google.android.gms:play-services-auth-api-phone", version.ref = "play-service-auth-phone" }
210+
play-integrity = { module = "com.google.android.play:integrity", version = "1.6.0" }
227211
play-service-ml-barcode = { module = "com.google.android.gms:play-services-mlkit-barcode-scanning", version.ref = "play-service-ml-barcode" }
228212

229213
# Google Play Billing
@@ -239,7 +223,6 @@ kin-sdk = { module = "org.kin.sdk.android:base", version.ref = "kin-sdk" }
239223
javax-inject = { module = "javax.inject:javax.inject", version = "1" }
240224

241225
# UI / Charts
242-
mp-android-chart = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mp-android-chart" }
243226
vico-compose = { module = "com.patrykandpatrick.vico:compose", version.ref = "vico" }
244227

245228
# Phone number
@@ -249,11 +232,6 @@ lib-phone-number-google = { module = "com.googlecode.libphonenumber:libphonenumb
249232
# QR / Scanning
250233
zxing = { module = "com.google.zxing:core", version.ref = "zxing" }
251234

252-
# Markdown
253-
markwon-core = { module = "io.noties.markwon:core", version.ref = "markwon" }
254-
markwon-linkify = { module = "io.noties.markwon:linkify", version.ref = "markwon" }
255-
markwon-ext-strikethrough = { module = "io.noties.markwon:ext-strikethrough", version.ref = "markwon" }
256-
257235
# Logging / Error Tracking
258236
timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
259237
bugsnag = { module = "com.bugsnag:bugsnag-android", version.ref = "bugsnag" }
@@ -279,7 +257,6 @@ junit = { module = "junit:junit", version.ref = "junit" }
279257
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
280258
espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
281259
espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" }
282-
mockk = { module = "io.mockk:mockk", version = "1.14.6" }
283260

284261
# Screenshot testing
285262
screenshot-validation-api = { module = "com.android.tools.screenshot:screenshot-validation-api", version.ref = "screenshot" }

libs/crypto/solana/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616
implementation(project(":libs:encryption:sha256"))
1717
implementation(project(":libs:encryption:sha512"))
1818
implementation(project(":libs:encryption:utils"))
19-
implementation(project(":libs:crypto:kin"))
2019
implementation(project(":libs:currency"))
2120
implementation(libs.kotlinx.serialization.json)
2221

libs/crypto/solana/src/main/kotlin/com/getcode/solana/AgoraMemo.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.getcode.solana
33
import com.getcode.solana.AgoraMemo.Companion.maxMagicByteIndicatorSize
44
import com.getcode.utils.decodeBase64
55
import com.getcode.utils.encodeBase64ToArray
6-
import org.kin.sdk.base.tools.byteArrayToInt
7-
import org.kin.sdk.base.tools.shl
8-
import org.kin.sdk.base.tools.subByteArray
6+
import com.getcode.utils.byteArrayToInt
7+
import com.getcode.utils.shl
8+
import com.getcode.utils.subByteArray
99
import kotlin.experimental.and
1010
import kotlin.experimental.or
1111
import kotlin.experimental.xor

0 commit comments

Comments
 (0)