Skip to content

Commit 5f9824f

Browse files
authored
Upgrade kotlin to 2.2.10 (#756)
Also bumped dependencies (SQLDelight, Okio, and Android libraries). Note that kotlin 2.2.20 is available, but not supported by SKIE just yet.
1 parent a65a815 commit 5f9824f

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

gradle/libs.versions.toml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
22
lightningkmp = "1.10.8"
33
secp256k1 = "0.19.0" # keep in check with lightning-kmp secp version
44

5-
kotlin = "2.1.10"
5+
kotlin = "2.2.10"
66
ktor = "3.1.0"
7-
sqldelight = "2.0.2"
8-
okio = "3.8.0"
7+
sqldelight = "2.1.0"
8+
okio = "3.15.0"
99

1010
# iOS
11-
skie = "0.10.5"
11+
skie = "0.10.6"
1212

1313
# Android
1414
androidx-junit = "1.1.3"
15-
androidx-corektx = "1.13.1"
16-
androidx-appcompat = "1.7.0"
17-
androidx-lifecycle = "2.8.7"
15+
androidx-corektx = "1.17.0"
16+
androidx-appcompat = "1.7.1"
17+
androidx-lifecycle = "2.9.4"
1818

1919
androidx-biometrics = "1.1.0"
20-
androidx-datastore = "1.1.2"
21-
androidx-workmanager = "2.9.1"
20+
androidx-datastore = "1.1.7"
21+
androidx-workmanager = "2.10.5"
2222

23-
androidx-compose-common = "1.8.0"
24-
androidx-compose-navigation = "2.8.7"
23+
androidx-compose-common = "1.9.3"
24+
androidx-compose-navigation = "2.9.5"
2525
androidx-compose-constraintlayout = "1.1.0"
2626
androidx-compose-material3 = "1.3.1"
2727
accompanist = "0.30.1"
2828

29-
slf4j = "2.0.16"
29+
androidx-camera = "1.5.1"
30+
31+
slf4j = "2.0.17"
3032
zxing = "3.5.3"
3133
logback = "3.0.0"
3234

33-
fcm = "24.1.0"
34-
playservices = "18.5.0"
35+
fcm = "25.0.1"
36+
playservices = "18.9.0"
3537

36-
junit = "4.13"
37-
espresso = "3.3.0"
38+
junit = "4.13.2"
39+
espresso = "3.7.0"
3840
robolectric = "4.13"
39-
agp = "8.12.2"
41+
agp = "8.12.3"
4042

4143
[libraries]
4244
agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
4345
kgp = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
4446
serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
4547
sqldelight-plugin = { group = "app.cash.sqldelight", name = "gradle-plugin", version.ref = "sqldelight" }
46-
fcm-plugin = { module = "com.google.gms:google-services", version = "4.4.2" }
48+
fcm-plugin = { module = "com.google.gms:google-services", version = "4.4.4" }
4749

4850
[plugins]
4951
compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

phoenix-android/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ val chain: String by project
2121

2222
android {
2323
namespace = "fr.acinq.phoenix.android"
24-
compileSdk = 35
24+
compileSdk = 36
2525
defaultConfig {
2626
applicationId = "fr.acinq.phoenix.testnet"
2727
minSdk = 26
28-
targetSdk = 35
28+
targetSdk = 36
2929
versionCode = 109
3030
versionName = gitCommitHash()
3131
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -131,10 +131,10 @@ dependencies {
131131
implementation("com.google.zxing:core:${libs.versions.zxing.get()}")
132132

133133
// -- CameraX: camera device compatibility & fixes + lifecycle handling
134-
implementation("androidx.camera:camera-core:1.4.1")
135-
implementation("androidx.camera:camera-camera2:1.4.1")
136-
implementation("androidx.camera:camera-lifecycle:1.4.1")
137-
implementation("androidx.camera:camera-view:1.4.1")
134+
implementation("androidx.camera:camera-core:${libs.versions.androidx.camera.get()}")
135+
implementation("androidx.camera:camera-camera2:${libs.versions.androidx.camera.get()}")
136+
implementation("androidx.camera:camera-lifecycle:${libs.versions.androidx.camera.get()}")
137+
implementation("androidx.camera:camera-view:${libs.versions.androidx.camera.get()}")
138138

139139
// -- logging
140140
implementation("org.slf4j:slf4j-api:${libs.versions.slf4j.get()}")

0 commit comments

Comments
 (0)