Skip to content
Closed
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
18 changes: 9 additions & 9 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ kotlin {
}

dependencies {
val composeBom = platform("androidx.compose:compose-bom:2026.06.01")
val composeBom = platform("androidx.compose:compose-bom:2026.09.00")
implementation(composeBom)

implementation("androidx.core:core-ktx:1.19.0")
implementation("androidx.core:core-ktx:1.19.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.11.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0")
implementation("androidx.activity:activity-compose:1.13.0")
implementation("androidx.navigation:navigation-compose:2.9.8")
implementation("androidx.navigation:navigation-compose:2.10.2")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -133,14 +133,14 @@ dependencies {
implementation("com.google.dagger:hilt-android:2.60.1")
ksp("com.google.dagger:hilt-android-compiler:2.60.1")
implementation("androidx.hilt:hilt-navigation-compose:1.4.0")
implementation("androidx.work:work-runtime-ktx:2.10.0")
implementation("androidx.work:work-runtime-ktx:2.12.0")
implementation("androidx.hilt:hilt-work:1.4.0")
ksp("androidx.hilt:hilt-compiler:1.4.0")

// Networking
implementation("com.squareup.retrofit2:retrofit:3.0.0")
implementation("com.squareup.okhttp3:okhttp:5.4.0")
implementation("com.squareup.okhttp3:logging-interceptor:5.4.0")
implementation("com.squareup.okhttp3:okhttp:5.5.0")
implementation("com.squareup.okhttp3:logging-interceptor:5.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
implementation("com.squareup.retrofit2:converter-kotlinx-serialization:3.0.0")

Expand All @@ -152,7 +152,7 @@ dependencies {
// provides the Play Services backend; googleid supplies GetGoogleIdOption + GoogleIdTokenCredential.
implementation("androidx.credentials:credentials:1.6.0")
implementation("androidx.credentials:credentials-play-services-auth:1.6.0")
implementation("com.google.android.libraries.identity.googleid:googleid:1.2.0")
implementation("com.google.android.libraries.identity.googleid:googleid:1.2.1")

// Barcode scanning (Phase 2): CameraX preview + ML Kit on-device barcode model
implementation("androidx.camera:camera-camera2:1.6.1")
Expand Down Expand Up @@ -188,8 +188,8 @@ dependencies {
androidTestImplementation("androidx.test:rules:1.7.0")
androidTestImplementation("com.google.dagger:hilt-android-testing:2.60.1")
kspAndroidTest("com.google.dagger:hilt-android-compiler:2.60.1")
androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.4.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.4.0")
androidTestImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
testImplementation("com.squareup.okhttp3:mockwebserver:5.5.0")
}

tasks.withType<Test>().configureEach {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file. Plugin versions are declared here and applied per-module.
plugins {
id("com.android.application") version "9.3.1" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.4.10" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.4.10" apply false
id("com.google.devtools.ksp") version "2.3.11" apply false
id("com.android.application") version "9.4.1" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.4.20" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.4.20" apply false
id("com.google.devtools.ksp") version "2.3.12" apply false
id("com.google.dagger.hilt.android") version "2.60.1" apply false
// Style gates (ROADMAP W19). Both run against committed baselines so they gate
// new violations without requiring a big-bang cleanup of existing code.
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 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
18 changes: 7 additions & 11 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 12 additions & 24 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading