diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f6ed0eb9..26ee12e1 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@v3 - name: set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 17 - name: Build with Gradle diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts index 644e0080..1a82c74e 100644 --- a/android-app/build.gradle.kts +++ b/android-app/build.gradle.kts @@ -126,11 +126,11 @@ tasks.withType { } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") - implementation(platform("com.google.firebase:firebase-bom:26.2.0")) + implementation(platform("com.google.firebase:firebase-bom:32.0.0")) implementation("com.google.firebase:firebase-analytics-ktx") - implementation("androidx.activity:activity-compose:1.6.0") + implementation("androidx.activity:activity-compose:1.7.1") with(Deps.Koin) { @@ -156,7 +156,7 @@ dependencies { } implementation("io.github.pushpalroy:jetlime:1.0.3") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4") - implementation("com.google.maps.android:android-maps-utils:2.3.0") + implementation("com.google.maps.android:android-maps-utils:3.4.0") with(Deps.PlayServices) { implementation(maps) @@ -164,8 +164,8 @@ dependencies { } testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.3") - androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") implementation(project(":SharedCode")) } diff --git a/ar/build.gradle b/ar/build.gradle index 0220f5ba..9c74fe33 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.37.0' + implementation 'de.javagl:obj:0.4.0' } diff --git a/build.gradle.kts b/build.gradle.kts index 822b5b26..76714eed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.4.2") + classpath("com.android.tools.build:gradle:8.0.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}") classpath("com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}") diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index a8776d2a..85a3f419 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -3,30 +3,30 @@ object Versions { const val kotlin = "1.8.20" const val kotlinCoroutines = "1.6.4" const val kotlinxSerialization = "1.4.1" - const val ktor = "2.2.4" + const val ktor = "2.3.0" const val koinCore = "3.4.0" const val koinAndroid = "3.4.0" - const val koinAndroidCompose = "3.4.3" + const val koinAndroidCompose = "3.4.4" const val sqlDelight = "1.5.5" const val kotlinxDateTime = "0.4.0" const val multiplatformSettings = "1.0.0" - const val kmpNativeCoroutines = "1.0.0-ALPHA-4" + const val kmpNativeCoroutines = "1.0.0-ALPHA-10" - const val compose = "1.4.0" - const val composeCompiler = "1.4.5" - const val navCompose = "2.5.2" - const val accompanist = "0.29.0-alpha" - const val mapsCompose = "2.11.0" - const val composeMaterial3 = "1.0.0" + const val compose = "1.4.3" + const val composeCompiler = "1.4.7" + const val navCompose = "2.5.3" + const val accompanist = "0.30.1" + const val mapsCompose = "2.11.4" + const val composeMaterial3 = "1.1.0" - const val kermit = "1.0.0" - const val slf4j = "1.7.30" + const val kermit = "1.2.2" + const val slf4j = "2.0.7" - const val junit = "4.12" - const val mockito = "2.27.0" - const val robolectric = "3.6.1" + const val junit = "4.13.2" + const val mockito = "5.2.0" + const val robolectric = "4.10.3" } @@ -37,8 +37,8 @@ object AndroidSdk { } object Firebase { - val core = "com.google.firebase:firebase-core:16.0.9" - val performance = "com.google.firebase:firebase-perf:16.2.3" + val core = "com.google.firebase:firebase-core:21.1.1" + val performance = "com.google.firebase:firebase-perf:20.3.2" } @@ -75,8 +75,8 @@ object Deps { } object PlayServices { - val location = "com.google.android.gms:play-services-location:16.0.0" - val maps = "com.google.android.gms:play-services-maps:18.0.2" + val location = "com.google.android.gms:play-services-location:21.0.1" + val maps = "com.google.android.gms:play-services-maps:18.1.0" } object Koin { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9197d199..15240115 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip