From 9c369f4a95b5bad2df45e6997cf678a4eeae64ca Mon Sep 17 00:00:00 2001 From: Yash-Garg Date: Fri, 8 Sep 2023 16:34:24 +0530 Subject: [PATCH 1/2] chore: bump dependencies and fix deprecated methods --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 27 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle.kts | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4adf1590..0d7b442b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { id("dev.yashgarg.qbit.kotlin-common") } -val clean by tasks.existing(Delete::class) { delete(rootProject.buildDir) } +val clean by tasks.existing(Delete::class) { delete(rootProject.layout.buildDirectory) } afterEvaluate { tasks.prepareKotlinBuildScriptModel.dependsOn(tasks.copyGitHooks, tasks.installGitHooks) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21cced56..adc9cd28 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,33 +1,32 @@ [versions] -axCore = "1.10.1" +axCore = "1.12.0" axAppcompat = "1.6.1" axActivity = "1.7.2" axConstraintlayout = "2.1.4" axDatastore = "1.0.0" -axNavigation = "2.6.0" -axTest = "1.4.0" +axNavigation = "2.7.2" axWork = "2.8.1" binary_compat = "0.13.2" -coroutines = "1.7.1" +coroutines = "1.7.3" googleMaterial = "1.9.0" -agp = "8.2.0-alpha07" +agp = "8.2.0-alpha15" espresso = "3.5.1" -hilt = "2.46.1" +hilt = "2.48" axHilt = "1.0.0" ktor = "2.3.1" -lifecycle = "2.6.1" -kotlin = "1.8.21" +lifecycle = "2.6.2" +kotlin = "1.9.10" mockito = "5.3.1" -room = "2.5.1" +room = "2.5.2" spotless = "6.19.0" uiautomator = "2.2.0" -serialization = "1.5.1" +serialization = "1.6.0" [libraries] androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "axCore" } androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "axActivity" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "axAppcompat" } -androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha15" +androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-beta05" androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "axConstraintlayout" } androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "axDatastore" } androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" @@ -56,9 +55,9 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te coroutines-turbine = { module = "app.cash.turbine:turbine", version = "0.13.0" } compose-activity = "androidx.activity:activity-compose:1.7.2" -compose-compiler = "androidx.compose.compiler:compiler:1.4.7" -compose-foundation = "androidx.compose.foundation:foundation:1.4.3" -compose-material3 = "androidx.compose.material3:material3:1.1.0" +compose-compiler = "androidx.compose.compiler:compiler:1.5.3" +compose-foundation = "androidx.compose.foundation:foundation:1.5.1" +compose-material3 = "androidx.compose.material3:material3:1.1.1" compose-material-icons = "org.jetbrains.compose.material:material-icons-extended-desktop:1.4.0" compose-theme-adapter = "com.google.accompanist:accompanist-themeadapter-material3:0.30.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2c3425d4..ce3e21b3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionSha256Sum=222818637ce0a4cb82e322bf847ea49ac319aecdb363d81acabd9e81315d08f6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 305afc32..571df021 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,7 @@ dependencyResolutionManagement { } } -plugins { id("com.gradle.enterprise") version "3.13.3" } +plugins { id("com.gradle.enterprise") version "3.14.1" } gradleEnterprise { buildScan { From 0e43dbfef19a5bf835338d5d56fa878d0fa2ee53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:08:07 +0000 Subject: [PATCH 2/2] fix(deps): update dependency me.saket.cascade:cascade to v2.2.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index adc9cd28..30919231 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -75,7 +75,7 @@ ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotia ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } tools-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.11" -tools-cascade = "me.saket.cascade:cascade:2.0.0" +tools-cascade = "me.saket.cascade:cascade:2.2.0" tools-kotlin-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.18" tools-lottie = "com.airbnb.android:lottie:6.0.1" tools-whatthestack = "com.github.haroldadmin:WhatTheStack:1.0.0-alpha04"