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 b6725658..d3bc5ad7 100644 --- a/android-app/build.gradle.kts +++ b/android-app/build.gradle.kts @@ -111,11 +111,11 @@ android { dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") - implementation(platform("com.google.firebase:firebase-bom:26.2.0")) + implementation(platform("com.google.firebase:firebase-bom:33.0.0")) implementation("com.google.firebase:firebase-analytics-ktx") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.activity:activity-compose:1.9.0") implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.foundation) @@ -129,8 +129,8 @@ dependencies { implementation(libs.androidx.compose.material.iconsExtended) implementation(libs.androidx.compose.material3.windowSizeClass) - implementation("com.google.maps.android:maps-compose:2.11.0") - implementation("com.google.maps.android:maps-compose-utils:2.11.0") + implementation("com.google.maps.android:maps-compose:5.0.1") + implementation("com.google.maps.android:maps-compose-utils:5.0.1") implementation(libs.accompanist.swiperefresh) @@ -140,16 +140,16 @@ dependencies { implementation(libs.koin.android) implementation(libs.koin.androidx.compose) - implementation("io.github.pushpalroy:jetlime:2.0.1") + implementation("io.github.pushpalroy:jetlime:2.2.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.0-beta02") + implementation("androidx.compose.material3:material3-android:1.2.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.8.2") - 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.2.0") + implementation("com.google.android.gms:play-services-maps:18.2.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") diff --git a/ar/build.gradle b/ar/build.gradle index 0220f5ba..831e9090 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.43.0' + implementation 'de.javagl:obj:0.4.0' } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3844b634..f1513053 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,44 +1,44 @@ [versions] -composeUiTooling = "1.3.0" +composeUiTooling = "1.3.1" kotlin = "1.9.22" ksp = "1.9.22-1.0.17" coroutines = "1.8.0" kotlinxSerialization = "1.6.3" kotlinxDateTime = "0.6.0-RC" -androidGradlePlugin = "8.2.2" -koin = "3.5.3" -koinCompose = "3.5.3" -ktor = "2.3.8" -slf4j = "2.0.9" -sqlDelight = "2.0.1" -kmpNativeCoroutines = "1.0.0-ALPHA-23" -googleServices = "4.3.15" - -androidxActivity = "1.8.2" +androidGradlePlugin = "8.4.1" +koin = "3.5.6" +koinCompose = "3.5.6" +ktor = "2.3.11" +slf4j = "2.0.13" +sqlDelight = "2.0.2" +kmpNativeCoroutines = "1.0.0-ALPHA-30" +googleServices = "4.4.1" + +androidxActivity = "1.9.0" androidxComposeCompiler = "1.5.8" jbComposeCompiler = "1.5.4" -androidxComposeBom = "2024.02.01" +androidxComposeBom = "2024.05.00" androidxNavigationCompose = "2.7.7" -uiToolingPreview = "1.6.2" -wearCompose = "1.3.0" -androidxLifecycle = "2.7.0" -imageLoader = "1.7.6" +uiToolingPreview = "1.6.7" +wearCompose = "1.3.1" +androidxLifecycle = "2.8.0" +imageLoader = "1.7.8" osmdroidAndroid = "6.1.18" composeMultiplatform = "1.6.0" -accompanist = "0.32.0" +accompanist = "0.34.0" coilCompose = "2.6.0" -horologist = "0.6.3" -okhttp = "5.0.0-alpha.12" +horologist = "0.6.12" +okhttp = "5.0.0-alpha.14" junit = "4.13.2" androidxTestJUnit = "1.1.5" -robolectric = "4.11.1" +robolectric = "4.12.2" androidxTestCore = "1.5.0" -mockito = "3.11.2" +mockito = "5.2.0" multiplatformSettings = "1.1.1" -kermit = "2.0.2" +kermit = "2.0.3" minSdk = "24" minWearSdk = "26" @@ -46,12 +46,12 @@ targetSdk = "34" targetWearSdk = "33" compileSdk = "34" kotlinVersion = "1.9.22" -coreKtx = "1.12.0" +coreKtx = "1.13.1" espressoCore = "3.5.1" appcompat = "1.6.1" -material = "1.11.0" +material = "1.12.0" constraintlayout = "2.1.4" -lifecycleLivedataKtx = "2.7.0" +lifecycleLivedataKtx = "2.8.0" navigationFragmentKtx = "2.7.7" navigationUiKtx = "2.7.7" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0694bff6..7435c9c9 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists