From 116f371832139926fae1b643f532de19da56a564 Mon Sep 17 00:00:00 2001 From: Utkarsh Saxena Date: Sun, 15 Oct 2023 13:58:01 +0530 Subject: [PATCH 1/4] deps update --- app/build.gradle | 19 +++++++------------ .../com/hieuwu/groceriesstore/MainActivity.kt | 3 ++- .../presentation/delivery/DeliveryFragment.kt | 4 ++-- .../orderhistory/OrderHistoryFragment.kt | 1 - gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- local.properties | 4 ++-- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f1445dac..f72e0869 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,11 +13,12 @@ plugins { android { compileSdk 34 - buildToolsVersion "31.0.0" defaultConfig { applicationId "com.hieuwu.groceriesstore" - minSdkVersion 22 + buildToolsVersion = "31.0.0" + + minSdkVersion 28 targetSdkVersion 33 versionCode 5 versionName "1.0" @@ -40,12 +41,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_1_8.toString() } buildFeatures { @@ -93,9 +94,7 @@ dependencies { implementation platform(libs.firebase.bom) implementation libs.bundles.firebase -// implementation 'io.supabase:postgrest-kt:0.9.0-alpha-4' -// implementation("io.github.jan-tennert.supabase:postgrest-kt:0.2.0") implementation("io.ktor:ktor-client-cio:1.6.0") implementation("io.github.jan-tennert.supabase:postgrest-kt-android:0.9.0-alpha-4") implementation "io.ktor:ktor-client-android:2.2.1" @@ -144,9 +143,5 @@ detekt { } ktlint { -// android.set(true) -// reporters { -// reporter(ReporterType.PLAIN) -// reporter(ReporterType.HTML) -// } + } diff --git a/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt b/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt index 0a13a50a..d7c3e5b2 100644 --- a/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt +++ b/app/src/main/java/com/hieuwu/groceriesstore/MainActivity.kt @@ -21,7 +21,8 @@ class MainActivity : AppCompatActivity() { val navHostFragment = supportFragmentManager.findFragmentById( R.id.appNavHostFragment ) as NavHostFragment - var navController = navHostFragment.navController + + val navController = navHostFragment.navController // Setup the bottom navigation view with navController val bottomNavigationView = findViewById(R.id.bottom_nav) diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt index c565435a..416884d9 100644 --- a/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt +++ b/app/src/main/java/com/hieuwu/groceriesstore/presentation/delivery/DeliveryFragment.kt @@ -13,7 +13,7 @@ import com.hieuwu.groceriesstore.databinding.FragmentDeliveryBinding import com.hieuwu.groceriesstore.utilities.KeyData class DeliveryFragment : Fragment() { - lateinit var binding: FragmentDeliveryBinding + private lateinit var binding: FragmentDeliveryBinding override fun onCreateView( inflater: LayoutInflater, @@ -21,7 +21,7 @@ class DeliveryFragment : Fragment() { savedInstanceState: Bundle? ): View? { - binding = DataBindingUtil.inflate( + binding = DataBindingUtil.inflate( inflater, R.layout.fragment_delivery, container, diff --git a/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt b/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt index 791c7c04..1e688ccb 100644 --- a/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt +++ b/app/src/main/java/com/hieuwu/groceriesstore/presentation/orderhistory/OrderHistoryFragment.kt @@ -11,7 +11,6 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class OrderHistoryFragment : Fragment() { - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c82dbb3..24166797 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -appCompatVersion = "1.4.2" +appCompatVersion = "1.6.1" buildGradleVersion = "7.4.2" cardViewVersion = "1.0.0" -carUiLibVersion = "2.0.0" +carUiLibVersion = "2.5.1" constraintLayoutVersion = "2.1.4" coordinatorLayoutVersion = "1.2.0" coreTestingVersion = "2.1.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 90425f4b..4f930633 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-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/local.properties b/local.properties index 2da2edd7..ba669182 100644 --- a/local.properties +++ b/local.properties @@ -4,8 +4,8 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue Oct 10 04:51:12 IST 2023 +#Sun Oct 15 13:05:21 IST 2023 API_KEY=YOUR_SUPABASE_KEY SECRET=YOUR_SUPABASE_SECRET SUPABASE_URL=YOUR_SUPABASE_URL -sdk.dir=/Users/hieuvu/Library/Android/sdk +sdk.dir=C\:\\Users\\HP\\AppData\\Local\\Android\\Sdk From eddb7d45650e774b53a61570fe60e593a4e1aa35 Mon Sep 17 00:00:00 2001 From: Utkarsh Saxena Date: Sun, 15 Oct 2023 16:13:29 +0530 Subject: [PATCH 2/4] minor updates --- app/build.gradle | 5 +++-- gradle/libs.versions.toml | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f72e0869..d90644a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,7 @@ android { compileSdk 34 defaultConfig { + namespace 'com.hieuwu.groceriesstore' applicationId "com.hieuwu.groceriesstore" buildToolsVersion = "31.0.0" @@ -46,7 +47,7 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = "1.8" } buildFeatures { @@ -58,7 +59,7 @@ android { composeOptions { kotlinCompilerExtensionVersion "1.2.0" } - namespace 'com.hieuwu.groceriesstore' + } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24166797..a1832b05 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ cardViewVersion = "1.0.0" carUiLibVersion = "2.5.1" constraintLayoutVersion = "2.1.4" coordinatorLayoutVersion = "1.2.0" -coreTestingVersion = "2.1.0" +coreTestingVersion = "2.2.0" coreVersion = "1.8.0" firebaseBomVersion = "30.3.2" fireStoreVersion = "24.2.2" @@ -13,8 +13,8 @@ firebaseVersion = "23.0.6" glideVersion = "4.13.2" glideComposeVersion = "1.0.0-beta01" googleServicesVersion = "4.3.13" -gsonVersion = "2.9.0" -hiltVersion = '2.42' +gsonVersion = "2.10.1" +hiltVersion = '2.47' jUnitVersion = "4.13.2" kotlinVersion = "1.7.0" kotlinCoroutineAdapter = "0.9.2" @@ -34,7 +34,7 @@ rxJavaVersion = "3.1.5" spotlessVersion = "6.8.0" testRunnerVersion = "1.4.0" timberVersion = "5.0.1" -workVersion = "2.7.1" +workVersion = "2.8.1" [libraries] androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompatVersion" } From ca7ee568c2bf705813aba569b9885b8c831fd924 Mon Sep 17 00:00:00 2001 From: Utkarsh Saxena Date: Sun, 15 Oct 2023 16:50:06 +0530 Subject: [PATCH 3/4] gradle version update --- app/build.gradle | 11 +++-------- build.gradle | 4 ---- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d90644a5..e7fe74aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,6 @@ android { buildConfigField("String", "SECRET", "\"${properties.getProperty("SECRET")}\"") buildConfigField("String", "SUPABASE_URL", "\"${properties.getProperty("SUPABASE_URL")}\"") - } buildTypes { @@ -118,13 +117,13 @@ dependencies { implementation("androidx.hilt:hilt-navigation-compose:1.0.0") implementation "com.github.bumptech.glide:compose:1.0.0-alpha.1" implementation "androidx.compose.material3:material3:1.1.1" - testImplementation("org.mockito:mockito-core:2.1.0") + testImplementation("org.mockito:mockito-core:5.3.1") debugImplementation "androidx.compose.ui:ui-tooling:1.4.2" implementation "androidx.compose.ui:ui-tooling-preview:1.4.2" def nav_version = "2.5.3" implementation("androidx.navigation:navigation-compose:$nav_version") - implementation "androidx.compose.material:material-icons-extended:1.0.0" + implementation "androidx.compose.material:material-icons-extended:1.5.3" implementation libs.caruilib testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" @@ -134,7 +133,7 @@ dependencies { androidTestImplementation libs.androidx.test.arch.core } -task wrapper(type: Wrapper) { +tasks.register('wrapper', Wrapper) { gradleVersion = '7.5' } @@ -142,7 +141,3 @@ detekt { config = files("${project.rootDir.absolutePath}/config/detekt/detekt.yml") buildUponDefaultConfig = true } - -ktlint { - -} diff --git a/build.gradle b/build.gradle index 3f4f12ed..e3acdce3 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,3 @@ subprojects { project.apply from: '../spotless.gradle' } } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a1832b05..a24046ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,8 +23,8 @@ kotlinxImmutable = "0.3.5" ktlintGradleVersion = "11.0.0" legacySupportVersion = "1.0.0" lifecycleVersion = "2.5.0" -lottieVersion = "5.2.0" -materialVersion = "1.6.1" +lottieVersion = "6.0.1" +materialVersion = "1.10.0" moshiConverterVersion = "2.9.0" moshiVersion = "1.12.0" navigationVersion = "2.4.2" @@ -32,7 +32,7 @@ retrofitVersion = "2.9.0" roomVersion = "2.5.0" rxJavaVersion = "3.1.5" spotlessVersion = "6.8.0" -testRunnerVersion = "1.4.0" +testRunnerVersion = "1.5.2" timberVersion = "5.0.1" workVersion = "2.8.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4f930633..0888d953 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.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 5f2ec50cc3273ccb20a465f3894a20a5fd9b2b41 Mon Sep 17 00:00:00 2001 From: Utkarsh Saxena Date: Mon, 16 Oct 2023 12:42:18 +0530 Subject: [PATCH 4/4] changes requested --- app/build.gradle | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e7fe74aa..a629a2a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,12 +41,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_12 + targetCompatibility JavaVersion.VERSION_12 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "12" } buildFeatures { @@ -117,7 +117,7 @@ dependencies { implementation("androidx.hilt:hilt-navigation-compose:1.0.0") implementation "com.github.bumptech.glide:compose:1.0.0-alpha.1" implementation "androidx.compose.material3:material3:1.1.1" - testImplementation("org.mockito:mockito-core:5.3.1") + testImplementation("org.mockito:mockito-core:2.1.0") debugImplementation "androidx.compose.ui:ui-tooling:1.4.2" implementation "androidx.compose.ui:ui-tooling-preview:1.4.2" @@ -141,3 +141,11 @@ detekt { config = files("${project.rootDir.absolutePath}/config/detekt/detekt.yml") buildUponDefaultConfig = true } + +ktlint { + // android.set(true) +// reporters { +// reporter(ReporterType.PLAIN) +// reporter(ReporterType.HTML) +// } +}