From 53ffb23520b8eeabb8bdce20339e7f44f80e350e Mon Sep 17 00:00:00 2001 From: Hieu Vu Date: Tue, 30 Jul 2024 22:25:39 +0700 Subject: [PATCH 1/7] Upgrade gradle and lib versions --- app/build.gradle | 6 ++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8289ab5a..5b8abdb9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { defaultConfig { applicationId "com.hieuwu.groceriesstore" - minSdkVersion 22 + minSdkVersion 29 targetSdkVersion 33 versionCode 5 versionName "1.0" @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.5.2" + kotlinCompilerExtensionVersion "1.5.14" } namespace 'com.hieuwu.groceriesstore' } @@ -140,8 +140,6 @@ dependencies { def nav_version = "2.5.3" implementation(libs.androidx.navigation.compose) implementation libs.androidx.material.icons.extended - - implementation libs.caruilib testImplementation libs.mockito.kotlin testImplementation libs.junit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 03a230e8..5dd0db02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 10 05:12:00 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f104a306ae861a21b980d8e82eea8a0d0434f66c Mon Sep 17 00:00:00 2001 From: Hieu Vu Date: Tue, 30 Jul 2024 22:26:09 +0700 Subject: [PATCH 2/7] Upgrade gradle and lib versions --- gradle/libs.versions.toml | 59 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0774c4e4..fff29d37 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,54 +1,53 @@ [versions] accompanistThemeadapterMaterialVersion = "0.28.0" -appCompatVersion = "1.4.2" -buildGradleVersion = "8.2.2" +appCompatVersion = "1.7.0" +buildGradleVersion = "8.3.0" cardViewVersion = "1.0.0" -carUiLibVersion = "2.0.0" constraintLayoutVersion = "2.1.4" coordinatorLayoutVersion = "1.2.0" coreTestingVersion = "2.2.0" -coreVersion = "1.12.0" -firebaseBomVersion = "32.7.0" -fireStoreVersion = "24.10.0" -firebaseVersion = "23.4.0" +coreVersion = "1.13.1" +firebaseBomVersion = "33.1.2" +fireStoreVersion = "25.0.0" +firebaseVersion = "24.0.0" glideVersion = "4.13.2" glideComposeVersion = "1.0.0-beta01" -googleServicesVersion = "4.3.13" -gsonVersion = "2.9.0" -hiltNavigationComposeVersion = "1.0.0" -hiltVersion = '2.48' +googleServicesVersion = "4.4.2" +gsonVersion = "2.10.1" +hiltNavigationComposeVersion = "1.2.0" +hiltVersion = '2.49' jUnitVersion = "4.13.2" -kotlinVersion = "1.9.0" +kotlinVersion = "1.9.24" kotlinCoroutineAdapter = "0.9.2" -kotlinCoroutinePlayServicesVersion = "1.6.4" +kotlinCoroutinePlayServicesVersion = "1.8.0" kotlinxImmutable = "0.3.5" ktlintGradleVersion = "11.0.0" ktorClientAndroidVersion = "2.3.0" -ktorClientCioVersion = "1.6.0" -ktorClientCoreVersion = "2.2.4" +ktorClientCioVersion = "2.3.10" +ktorClientCoreVersion = "2.3.10" ktorClientLoggingJvmVersion = "1.6.0" -ktorUtilsJvmVersion = "1.6.0" +ktorUtilsJvmVersion = "2.3.10" legacySupportVersion = "1.0.0" -lifecycleVersion = "2.5.0" +lifecycleVersion = "2.8.4" lottieVersion = "5.2.0" -material3Version = "1.1.1" -materialIconsExtendedVersion = "1.0.0" -materialVersion = "1.6.1" -mockitoCoreVersion = "2.1.0" +material3Version = "1.2.1" +materialIconsExtendedVersion = "1.6.8" +materialVersion = "1.12.0" +mockitoCoreVersion = "5.11.0" mockitoKotlinVersion = "5.1.0" moshiConverterVersion = "2.9.0" moshiVersion = "1.12.0" -navigationComposeVersion = "2.5.3" -navigationVersion = "2.5.0" +navigationComposeVersion = "2.7.7" +navigationVersion = "2.7.7" postgrestKtAndroidVersion = "2.0.0" -retrofitVersion = "2.9.0" -roomVersion = "2.5.0" +retrofitVersion = "2.11.0" +roomVersion = "2.6.1" spotlessVersion = "6.8.0" -testRunnerVersion = "1.4.0" +testRunnerVersion = "1.6.1" timberVersion = "5.0.1" -uiToolingPreviewVersion = "1.6.1" -uiToolingVersion = "1.4.2" -workVersion = "2.7.1" +uiToolingPreviewVersion = "1.6.8" +uiToolingVersion = "1.6.8" +workVersion = "2.9.0" [libraries] accompanist-themeadapter-material = { module = "com.google.accompanist:accompanist-themeadapter-material", version.ref = "accompanistThemeadapterMaterialVersion" } @@ -66,7 +65,6 @@ androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreviewVersion" } androidx-work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "workVersion" } cardview = { module = "androidx.cardview:cardview", version.ref = "cardViewVersion" } -caruilib = { module = "com.android.car.ui:car-ui-lib", version.ref = "carUiLibVersion" } constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintLayoutVersion" } coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "coordinatorLayoutVersion" } firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBomVersion" } @@ -99,7 +97,6 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = " moshi = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshiVersion" } navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationVersion" } navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationVersion" } -postgrest-kt-android = { module = "io.github.jan-tennert.supabase:postgrest-kt-android", version.ref = "postgrestKtAndroidVersion" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofitVersion" } retrofit-converter-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "moshiConverterVersion" } retrofit-coroutines-adapter = { module = "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter", version.ref = "kotlinCoroutineAdapter" } From 3a7f1c10c4adbd69aa04d87d7f20dcb4604f7bec Mon Sep 17 00:00:00 2001 From: Hieu Vu Date: Tue, 30 Jul 2024 22:26:26 +0700 Subject: [PATCH 3/7] Fix breaking code --- .../composable/SwipeToDeleteContainer.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt index 7cc0eea0..062acd07 100644 --- a/app/src/main/java/com/hieuwu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt +++ b/app/src/main/java/com/hieuwu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt @@ -8,15 +8,14 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.material.DismissDirection +import androidx.compose.material.DismissState +import androidx.compose.material.DismissValue +import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete -import androidx.compose.material3.DismissDirection -import androidx.compose.material3.DismissState -import androidx.compose.material3.DismissValue -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material.rememberDismissState import androidx.compose.material3.Icon -import androidx.compose.material3.SwipeToDismiss -import androidx.compose.material3.rememberDismissState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -30,7 +29,7 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterialApi::class) @Composable fun SwipeToDeleteContainer( item: T, @@ -42,7 +41,7 @@ fun SwipeToDeleteContainer( mutableStateOf(false) } val state = rememberDismissState( - confirmValueChange = { value -> + confirmStateChange = { value -> if (value == DismissValue.DismissedToStart) { isRemoved = true true @@ -66,7 +65,7 @@ fun SwipeToDeleteContainer( shrinkTowards = Alignment.Top ) + fadeOut() ) { - SwipeToDismiss( + androidx.compose.material.SwipeToDismiss( state = state, background = { DeleteBackground(swipeDismissState = state) @@ -77,7 +76,7 @@ fun SwipeToDeleteContainer( } } -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterialApi::class) @Composable fun DeleteBackground( swipeDismissState: DismissState From e381a49f50f78d8ae7e0419d0587973b8e498855 Mon Sep 17 00:00:00 2001 From: Hieu Vu Date: Tue, 30 Jul 2024 22:27:30 +0700 Subject: [PATCH 4/7] Update .idea file --- .idea/kotlinc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fdf8d994..148fdd24 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file From 711a5215d507b6b379d45b0f0dcc7d079ec351ef Mon Sep 17 00:00:00 2001 From: Hieu Vu Date: Sun, 4 Aug 2024 20:42:09 +0700 Subject: [PATCH 5/7] Remove unused code --- .idea/gradle.xml | 1 + app/build.gradle | 5 - config/detekt/detekt.yml | 723 --------------------------------------- 3 files changed, 1 insertion(+), 728 deletions(-) delete mode 100644 config/detekt/detekt.yml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0b0534c6..a0d9faaf 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,6 +10,7 @@