From 5f164ff5a6c35ec5ebc7739c24fb99376f5aaee4 Mon Sep 17 00:00:00 2001 From: Daniel Shokouhi Date: Tue, 21 Feb 2023 09:55:00 -0800 Subject: [PATCH] Bump some project dependencies (#3347) * Bump some project dependencies * Bump kotlin too * Use correct kotlin library --- app/build.gradle.kts | 18 +++++++++--------- build.gradle.kts | 2 +- common/build.gradle.kts | 6 +++--- wear/build.gradle.kts | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d1999e63f..c26949a95 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,7 +44,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.3.2" + kotlinCompilerExtensionVersion = "1.4.2" } kotlinOptions { @@ -144,8 +144,8 @@ dependencies { implementation("com.maltaisn:icondialog:3.3.0") implementation("com.maltaisn:iconpack-community-material:5.3.45") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.10") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") "fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4") @@ -153,12 +153,12 @@ dependencies { implementation("com.google.dagger:hilt-android:2.45") kapt("com.google.dagger:hilt-android-compiler:2.45") - implementation("androidx.appcompat:appcompat:1.6.0-rc01") + implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.preference:preference-ktx:1.2.0") - implementation("com.google.android.material:material:1.7.0") + implementation("com.google.android.material:material:1.8.0") implementation("androidx.fragment:fragment-ktx:1.5.5") implementation("com.squareup.retrofit2:retrofit:2.9.0") @@ -168,7 +168,7 @@ dependencies { "fullImplementation"("com.google.android.gms:play-services-location:21.0.1") "fullImplementation"("com.google.android.gms:play-services-home:16.0.0") - "fullImplementation"(platform("com.google.firebase:firebase-bom:31.1.1")) + "fullImplementation"(platform("com.google.firebase:firebase-bom:31.2.2")) "fullImplementation"("com.google.firebase:firebase-messaging") "fullImplementation"("io.sentry:sentry-android:6.14.0") "fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4") @@ -176,7 +176,7 @@ dependencies { "fullImplementation"("androidx.wear:wear-remote-interactions:1.0.0") implementation("androidx.biometric:biometric:1.1.0") - implementation("androidx.webkit:webkit:1.5.0") + implementation("androidx.webkit:webkit:1.6.0") implementation("com.google.android.exoplayer:exoplayer-core:2.18.2") implementation("com.google.android.exoplayer:exoplayer-hls:2.18.2") @@ -187,9 +187,9 @@ dependencies { } "minimalImplementation"("org.chromium.net:cronet-embedded:108.5359.79") - implementation(platform("androidx.compose:compose-bom:2022.10.00")) + implementation(platform("androidx.compose:compose-bom:2023.01.00")) implementation("androidx.compose.animation:animation") - implementation("androidx.compose.compiler:compiler:1.3.2") + implementation("androidx.compose.compiler:compiler:1.4.2") implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.material:material") implementation("androidx.compose.material:material-icons-core") diff --git a/build.gradle.kts b/build.gradle.kts index c64e06b6a..c699024c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:7.4.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") classpath("com.google.gms:google-services:4.3.15") classpath("com.google.firebase:firebase-appdistribution-gradle:3.2.0") classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 5e39bdade..fa5822690 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -55,8 +55,8 @@ android { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.10") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.google.dagger:hilt-android:2.45") @@ -66,7 +66,7 @@ dependencies { api("androidx.room:room-ktx:2.5.0") kapt("androidx.room:room-compiler:2.5.0") - api("androidx.work:work-runtime-ktx:2.7.1") + api("androidx.work:work-runtime-ktx:2.8.0") implementation("com.squareup.retrofit2:retrofit:2.9.0") implementation("com.squareup.retrofit2:converter-jackson:2.9.0") diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index a2f29e822..34471cae7 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -35,7 +35,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.3.2" + kotlinCompilerExtensionVersion = "1.4.2" } compileOptions { @@ -88,12 +88,12 @@ play { dependencies { implementation(project(":common")) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.10") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.6.4") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4") - implementation("com.google.android.material:material:1.7.0") + implementation("com.google.android.material:material:1.8.0") implementation("androidx.wear:wear:1.2.0") implementation("com.google.android.gms:play-services-wearable:18.0.0") @@ -108,19 +108,19 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.10.0") implementation("com.mikepenz:iconics-core:5.4.0") - implementation("androidx.appcompat:appcompat:1.5.1") + implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar") implementation("com.mikepenz:iconics-compose:5.4.0") implementation("androidx.activity:activity-ktx:1.6.1") implementation("androidx.activity:activity-compose:1.6.1") - implementation("androidx.compose.compiler:compiler:1.3.2") - implementation(platform("androidx.compose:compose-bom:2022.10.00")) + implementation("androidx.compose.compiler:compiler:1.4.2") + implementation(platform("androidx.compose:compose-bom:2023.01.00")) implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.ui:ui-tooling") - implementation("androidx.wear.compose:compose-foundation:1.1.1") - implementation("androidx.wear.compose:compose-material:1.1.1") - implementation("androidx.wear.compose:compose-navigation:1.1.1") + implementation("androidx.wear.compose:compose-foundation:1.1.2") + implementation("androidx.wear.compose:compose-material:1.1.2") + implementation("androidx.wear.compose:compose-navigation:1.1.2") implementation("com.google.guava:guava:31.1-android") implementation("androidx.wear.tiles:tiles:1.1.0") @@ -129,6 +129,6 @@ dependencies { implementation("androidx.health:health-services-client:1.0.0-beta02") - implementation(platform("com.google.firebase:firebase-bom:31.1.1")) + implementation(platform("com.google.firebase:firebase-bom:31.2.2")) implementation("com.google.firebase:firebase-messaging") }