Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[versions]
agp = "9.3.0"
camera = "1.5.2"
coil = "3.2.0"
coil = "3.6.3"
detekt = "1.23.8"
glance = "1.2.0-rc01"
glance = "1.3.0-alpha02"
hilt = "2.60.1"
hiltAndroidx = "1.3.0"
hiltAndroidx = "1.4.0"
kotlin = "2.3.21"
ktor = "3.3.3"
ktor = "3.6.0"
lifecycle = "2.10.0"
navCompose = "2.9.6"
room = "2.8.4"
slf4j = "2.0.17"
haze = "1.7.1"
navCompose = "2.10.2"
room = "2.8.5"
slf4j = "2.0.20"
haze = "1.7.3"

[libraries]
accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version = "0.36.0" }
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version = "0.37.3" }
activity-compose = { module = "androidx.activity:activity-compose", version = "1.12.2" }
appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
appcompat = { module = "androidx.appcompat:appcompat", version = "1.8.0" }
barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version = "17.3.0" }
biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha05" }
bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.5.18" }
paykit = { module = "com.synonym:paykit-android", version = "0.1.0-rc72" }
bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.83" }
bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.86" }
camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
camera-view = { module = "androidx.camera:camera-view", version.ref = "camera" }
Expand All @@ -38,12 +38,12 @@ compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.1" }
core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" }
constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.2" }
core-ktx = { module = "androidx.core:core-ktx", version = "1.19.1" }

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build is red: these versions need compileSdk 37 and the app compiles against 36. HIGH for this PR (it cannot merge as is); same break as the closed #1410.

build and build-local fail at a8e2bae in checkDevDebugAarMetadata:

:app is currently compiled against android-36.
 1. Dependency 'io.coil-kt.coil3:coil-compose-android:3.6.3' requires libraries and applications that depend on it to compile against version 37 or later
 5. Dependency 'androidx.glance:glance-appwidget:1.3.0-alpha02' requires …
 6. Dependency 'androidx.hilt:hilt-navigation-compose:1.4.0' requires …
 8. Dependency 'androidx.navigation:navigation-compose-android:2.10.2' requires …
 9. Dependency 'dev.chrisbanes.haze:haze-materials-android:1.7.3' requires …
11. Dependency 'androidx.compose.animation:animation-core-android:1.12.0' requires …

core-ktx 1.19.1 on this line is in the same set, alongside coil, glance, hilt-androidx, navigation-compose, haze, appcompat and material.

Fix: either raise compileSdk to 37 in app/build.gradle.kts:183 in a separate change first (on #1410 two ElectrumProbeServiceTest cases then failed, so that needs its own check), or have dependabot hold these artifacts at their last compileSdk-36 versions and bump the rest.

core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version = "1.2.0" }
datastore-preferences = { module = "androidx.datastore:datastore-preferences", version = "1.2.1" }
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt", version = "0.5.3" }
detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt", version = "0.6.7" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version = "34.8.0" }
glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }
glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "glance" }
Expand All @@ -54,10 +54,10 @@ hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", vers
hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltAndroidx" }
hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltAndroidx" }
hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hiltAndroidx" }
jna = { module = "net.java.dev.jna:jna", version = "5.18.1" }
jna = { module = "net.java.dev.jna:jna", version = "5.19.1" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.8" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.7.1" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.5.2" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.8.0" }
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
Expand All @@ -72,7 +72,7 @@ lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", v
lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
material = { module = "com.google.android.material:material", version = "1.13.0" }
material = { module = "com.google.android.material:material", version = "1.14.0" }
navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navCompose" }
navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "navCompose" }
room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
Expand All @@ -87,12 +87,12 @@ test-espresso-core = { module = "androidx.test.espresso:espresso-core", version
test-junit = { group = "junit", name = "junit", version = "4.13.2" }
test-kotlin = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
test-junit-ext = { module = "androidx.test.ext:junit", version = "1.3.0" }
test-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "6.2.2" }
test-robolectric = { module = "org.robolectric:robolectric", version = "4.16.1" }
test-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "6.4.0" }
test-robolectric = { module = "org.robolectric:robolectric", version = "4.17" }
test-turbine = { group = "app.cash.turbine", name = "turbine", version = "1.2.1" }
vss-client = { module = "com.synonym:vss-client-android", version = "0.5.23" }
webkit = { module = "androidx.webkit:webkit", version = "1.16.0" }
work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.11.0" }
work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version = "2.12.0" }
zxing = { module = "com.google.zxing:core", version = "3.5.4" }
lottie = { module = "com.airbnb.android:lottie-compose", version = "6.7.1" }
charts = { module = "io.github.ehsannarmani:compose-charts", version = "1.0.0" }
Expand All @@ -106,7 +106,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-stability-analyzer = { id = "com.github.skydoves.compose.stability.analyzer", version = "0.7.5" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
google-services = { id = "com.google.gms.google-services", version = "4.4.4" }
google-services = { id = "com.google.gms.google-services", version = "4.5.0" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version = "2.3.10" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Mar 21 13:35:39 GMT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading
Loading