diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f6ed0eb9..fbdaa591 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@v4 - name: set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 17 - name: Build with Gradle diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts index 7a1166a1..ea0a1ae4 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.3") - implementation(platform("com.google.firebase:firebase-bom:26.2.0")) + implementation(platform("com.google.firebase:firebase-bom:33.5.1")) implementation("com.google.firebase:firebase-analytics-ktx") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.activity:activity-compose:1.9.3") 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:3.0.1") // 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.1") 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.9.0") - 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.0.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.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") implementation(project(":SharedCode")) } diff --git a/ar/build.gradle b/ar/build.gradle index 0220f5ba..e43a6dc0 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.46.0' + implementation 'de.javagl:obj:0.4.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b3b2a7b..9d8a3038 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,28 +7,28 @@ kotlinx-dateTime = "0.6.1" composeUiTooling = "1.3.1" -androidGradlePlugin = "8.7.1" +androidGradlePlugin = "8.7.2" koin = "4.0.0" koinCompose = "4.0.0" koinComposeMultiplatform = "1.2.0-Beta4" -ktor = "3.0.0" +ktor = "3.0.1" slf4j = "2.0.16" sqlDelight = "2.0.2" -kmpNativeCoroutines = "1.0.0-ALPHA-35" +kmpNativeCoroutines = "1.0.0-ALPHA-37" googleServices = "4.4.2" androidxActivity = "1.9.3" androidxComposeCompiler = "1.5.8" jbComposeCompiler = "1.5.4" -androidxComposeBom = "2024.10.00" +androidxComposeBom = "2024.10.01" androidxNavigationCompose = "2.8.3" -uiToolingPreview = "1.7.4" -androidxLifecycle = "2.8.6" -imageLoader = "1.8.3" +uiToolingPreview = "1.7.5" +androidxLifecycle = "2.8.7" +imageLoader = "1.9.0" osmdroidAndroid = "6.1.20" -googleMapsCompose = "5.0.3" +googleMapsCompose = "6.2.1" -composeMultiplatform = "1.7.0" +composeMultiplatform = "1.7.1" accompanist = "0.36.0" coilCompose = "2.7.0" horologist = "0.6.20" @@ -38,7 +38,7 @@ junit = "4.13.2" androidxTestJUnit = "1.2.1" robolectric = "4.13" androidxTestCore = "1.6.1" -mockito = "3.11.2" +mockito = "5.2.0" multiplatformSettings = "1.2.0" kermit = "2.0.4" @@ -46,12 +46,12 @@ kermit = "2.0.4" minSdk = "24" targetSdk = "34" compileSdk = "34" -coreKtx = "1.13.1" +coreKtx = "1.15.0" espressoCore = "3.6.1" appcompat = "1.7.0" material = "1.12.0" -constraintlayout = "2.1.4" -lifecycleLivedataKtx = "2.8.6" +constraintlayout = "2.2.0" +lifecycleLivedataKtx = "2.8.7" navigationFragmentKtx = "2.8.3" navigationUiKtx = "2.8.3" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1030314a..28d60918 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun May 28 21:12:18 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists