diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f6ed0eb9..9e2bb956 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -8,9 +8,9 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v5 - name: set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: java-version: 17 - name: Build with Gradle diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts index 7a1166a1..715867fa 100644 --- a/android-app/build.gradle.kts +++ b/android-app/build.gradle.kts @@ -107,11 +107,11 @@ android { dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") - implementation(platform("com.google.firebase:firebase-bom:26.2.0")) + implementation(platform("com.google.firebase:firebase-bom:34.2.0")) implementation("com.google.firebase:firebase-analytics-ktx") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.activity:activity-compose:1.10.1") implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.foundation) @@ -136,20 +136,20 @@ dependencies { implementation(libs.koin.android) implementation(libs.koin.androidx.compose) - implementation("io.github.pushpalroy:jetlime:2.0.1") + implementation("io.github.pushpalroy:jetlime:4.0.0") // TODO: Added this as a temporary fix for a crash in ProgressIndicator, can be removed later. // Issue: https://github.com/JetBrains/compose-multiplatform/issues/4157 - implementation("androidx.compose.material3:material3-android:1.2.1") + implementation("androidx.compose.material3:material3-android:1.3.2") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1") - implementation("com.google.maps.android:android-maps-utils:2.3.0") + implementation("com.google.maps.android:android-maps-utils:3.16.1") - implementation("com.google.android.gms:play-services-location:16.0.0") - implementation("com.google.android.gms:play-services-maps:18.0.2") + implementation("com.google.android.gms:play-services-location:21.3.0") + implementation("com.google.android.gms:play-services-maps:19.2.0") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.3.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") implementation(project(":SharedCode")) } diff --git a/ar/build.gradle b/ar/build.gradle index 0220f5ba..408efe9b 100644 --- a/ar/build.gradle +++ b/ar/build.gradle @@ -29,6 +29,6 @@ dependencies { implementation Kotlin.stdLib // ARCore - implementation 'com.google.ar:core:1.4.0' - implementation 'de.javagl:obj:0.2.1' + implementation 'com.google.ar:core:1.50.0' + implementation 'de.javagl:obj:0.4.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8caa2ee..0826716d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,51 +6,51 @@ kotlinx-serialization = "1.9.0" kotlinx-dateTime = "0.7.1" -androidGradlePlugin = "8.12.0" -koin = "4.1.0" +androidGradlePlugin = "8.13.0" +koin = "4.1.1" ktor = "3.2.3" slf4j = "2.0.17" sqlDelight = "2.1.0" -kmpNativeCoroutines = "1.0.0-ALPHA-45" +kmpNativeCoroutines = "1.0.0-ALPHA-46" googleServices = "4.4.3" androidxActivity = "1.10.1" -androidxComposeBom = "2025.07.00" +androidxComposeBom = "2025.08.01" androidxNavigationCompose = "2.9.3" -uiToolingPreview = "1.8.3" -androidxLifecycle = "2.9.2" +uiToolingPreview = "1.9.0" +androidxLifecycle = "2.9.3" imageLoader = "1.10.0" osmdroidAndroid = "6.1.20" -googleMapsCompose = "6.7.0" +googleMapsCompose = "6.8.0" accompanist = "0.36.0" coilCompose = "2.7.0" -horologist = "0.6.23" +horologist = "0.7.15" okhttp = "5.1.0" junit = "4.13.2" androidxTestJUnit = "1.3.0" -robolectric = "4.15.1" +robolectric = "4.16" androidxTestCore = "1.7.0" mockito = "5.2.0" multiplatformSettings = "1.3.0" -kermit = "2.0.6" +kermit = "2.0.8" minSdk = "24" targetSdk = "36" compileSdk = "36" -coreKtx = "1.16.0" +coreKtx = "1.17.0" espressoCore = "3.7.0" appcompat = "1.7.1" material = "1.12.0" constraintlayout = "2.2.1" -lifecycleLivedataKtx = "2.9.2" +lifecycleLivedataKtx = "2.9.3" navigationFragmentKtx = "2.9.3" navigationUiKtx = "2.9.3" mcp = "0.6.0" -shadowPlugin = "9.0.0-rc3" +shadowPlugin = "9.1.0" [libraries] @@ -81,7 +81,7 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view androidx-tracing = "androidx.tracing:tracing:1.3.0" splash-screen = "androidx.core:core-splashscreen:1.0.1" -metrics = "androidx.metrics:metrics-performance:1.0.0-beta02" +metrics = "androidx.metrics:metrics-performance:1.0.0-beta03" imageLoader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "imageLoader" } osmdroidAndroid = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroid" }