Update dependencies

Drjacky · Dec 20, 2023 · 45575fd · 45575fd
1 parent 096078f
commit 45575fd
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 31 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MVVMTemplate 🧞‍
 
-![Language](https://img.shields.io/badge/Kotlin-1.9.0-blue) ![License](https://img.shields.io/github/license/Drjacky/MVVMTemplate?logo=MIT) [![Actions Status](https://github.com/Drjacky/MVVMTemplate/workflows/Pre%20Merge%20Checks/badge.svg)](https://github.com/Drjacky/MVVMTemplate/actions) [![Build Status](https://github.com/Drjacky/MVVMTemplate/workflows/Android%20CI/badge.svg)](https://github.com/Drjacky/MVVMTemplate/actions) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Drjacky_MVVMTemplate&metric=alert_status)](https://sonarcloud.io/dashboard?id=Drjacky_MVVMTemplate)
+![Language](https://img.shields.io/badge/Kotlin-1.9.21-blue) ![License](https://img.shields.io/github/license/Drjacky/MVVMTemplate?logo=MIT) [![Actions Status](https://github.com/Drjacky/MVVMTemplate/workflows/Pre%20Merge%20Checks/badge.svg)](https://github.com/Drjacky/MVVMTemplate/actions) [![Build Status](https://github.com/Drjacky/MVVMTemplate/workflows/Android%20CI/badge.svg)](https://github.com/Drjacky/MVVMTemplate/actions) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Drjacky_MVVMTemplate&metric=alert_status)](https://sonarcloud.io/dashboard?id=Drjacky_MVVMTemplate)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FDrjacky%2FMVVMTemplate.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FDrjacky%2FMVVMTemplate?ref=badge_shield)
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-MVVMTemplate-green.svg?style=flat)](https://android-arsenal.com/details/1/8368) [![CodeScene Code Health](https://codescene.io/projects/29433/status-badges/code-health)](https://codescene.io/projects/29433)
 <!-- [![Known Vulnerabilities](https://snyk.io/test/github/Drjacky/MVVMTemplate/badge.svg)](https://snyk.io/test/github/Drjacky/MVVMTemplate) Snyk doesn't support kotlin dsl -->

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -84,9 +84,13 @@ dependencies {
     implementation(Depends.Libraries.dataStore_preferences)
     implementation(Depends.Libraries.coroutines_android)
     //dependency injection
-    implementation(Depends.Libraries.hilt_android)
-    kapt(Depends.Libraries.hilt_android_compiler)
-    kapt(Depends.Libraries.hilt_compiler)
+    implementation(Depends.Libraries.dagger)
+    kapt(Depends.Libraries.dagger_compiler)
+    implementation(Depends.Libraries.dagger_hilt_android)
+    implementation(Depends.Libraries.dagger_hilt_navigation_compose)
+    kapt(Depends.Libraries.dagger_hilt_compiler)
+//    kapt(Depends.Libraries.dagger_hilt_android_compiler)
+//    kapt(Depends.Libraries.hilt_androidx_compiler)
     implementation(Depends.Libraries.java_inject)
     //network
     implementation(Depends.Libraries.retrofit)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,8 +9,8 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0")
-    implementation("com.android.tools.build:gradle:8.1.0")
-    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0")
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.21")
+    implementation("com.android.tools.build:gradle:8.2.0")
+    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4")
     implementation("com.squareup:javapoet:1.13.0")
 }
diff --git a/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt b/buildSrc/src/main/kotlin/app/web/drjackycv/buildsrc/Depends.kt
@@ -7,11 +7,12 @@ object Depends {
     object Versions {
         const val appVersionCode = 1_000_000
         const val r8Version = "8.1.56"
-        const val gradleVersion = "8.2.0-alpha15"
-        const val androidCompileSdkVersion = 33
-        const val targetSdkVersion = 33
+        const val gradleVersion = "8.2.0"
+        const val androidCompileSdkVersion = 34
+        const val targetSdkVersion = 34
         const val minSdkVersion = 21
-        const val kotlinVersion = "1.9.0"
+        const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        const val kotlinVersion = "1.9.21"
         const val rxKotlinVersion = "3.0.1"
         const val rxAndroidVersion = "3.0.2"
         const val rxJavaVersion = "3.1.5"
@@ -21,15 +22,15 @@ object Depends {
         const val chuckerVersion = "3.5.2"
         const val gsonVersion = "2.10"
         const val retrofitConverterGson = "2.9.0"
-        const val lifecycleVersion = "2.4.0"
+        const val lifecycleVersion = "2.6.0-alpha01"
         const val constraintLayoutVersion = "2.1.4"
         const val supportVersion = "1.4.1"
-        const val materialVersion = "1.4.0"
+        const val materialVersion = "1.6.0-alpha03"
         const val coreKtxVersion = "1.9.0"
         const val navigationVersion = "2.5.2"
         const val pagingVersion = "3.1.1"
         const val multidexVersion = "2.0.1"
-        const val fragmentExtVersion = "1.4.0"
+        const val fragmentExtVersion = "1.5.0-alpha03"
         const val recyclerviewVersion = "1.3.0-rc01"
         const val hiltVersion = "2.47"
         const val hiltCompilerVersion = "1.0.0"
@@ -51,7 +52,7 @@ object Depends {
         const val testCoreVersion = "1.4.0"
         const val testExtJunitVersion = "1.1.3"
         const val sonarqubeVersion = "3.5.0.2730"
-        const val detektVersion = "1.22.0"
+        const val detektVersion = "1.23.4"
         const val checkDependencyVersionsVersion = "0.44.0"
         const val gradleDoctorVersion = "0.8.1"
         const val dependencyAnalysisVersion = "1.17.0"
@@ -83,12 +84,18 @@ object Depends {
         const val kotlin_reflect =
             "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlinVersion}"
         const val multidex = "androidx.multidex:multidex:${Versions.multidexVersion}"
-        const val hilt_android =
-            "com.google.dagger:hilt-android:${Versions.hiltVersion}"
-        const val hilt_android_compiler =
-            "com.google.dagger:hilt-android-compiler:${Versions.hiltVersion}"
-        const val hilt_compiler =
-            "androidx.hilt:hilt-compiler:${Versions.hiltCompilerVersion}"
+        const val dagger = "com.google.dagger:dagger:${Versions.hiltVersion}"
+        const val dagger_compiler = "com.google.dagger:dagger-compiler:${Versions.hiltVersion}"
+        const val dagger_hilt_android = "com.google.dagger:hilt-android:${Versions.hiltVersion}"
+
+        /*const val dagger_hilt_android_compiler =
+            "com.google.dagger:hilt-android-compiler:${Versions.hiltVersion}"*/
+        /*const val hilt_androidx_compiler =
+            "androidx.hilt:hilt-compiler:${Versions.hiltCompilerVersion}"*/
+        /*const val dagger_hilt_core = "com.google.dagger:hilt-core:${Versions.hiltVersion}"*/
+        const val dagger_hilt_compiler = "com.google.dagger:hilt-compiler:${Versions.hiltVersion}"
+        const val dagger_hilt_navigation_compose =
+            "androidx.hilt:hilt-navigation-compose:${Versions.hiltNavigationComposeVersion}"
         const val fragment_ktx =
             "androidx.fragment:fragment-ktx:${Versions.fragmentExtVersion}"
         const val android_core_ktx =
@@ -139,8 +146,10 @@ object Depends {
             "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycleVersion}"
         const val lifecycle_runtime_ktx =
             "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycleVersion}"
-        const val lifecycle_common =
-            "androidx.lifecycle:lifecycle-common:${Versions.lifecycleVersion}"
+        const val lifecycle_viewmodel_runtime_ktx =
+            "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycleVersion}"
+        const val lifecycle_common_java8 =
+            "androidx.lifecycle:lifecycle-common-java8:${Versions.lifecycleVersion}"
         const val lifecycle_viewmodel_ktx =
             "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycleVersion}"
         const val recyclerview =

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -64,9 +64,13 @@ dependencies {
     implementation(Depends.Libraries.paging_rx)
     implementation(Depends.Libraries.multidex)
     //dependency injection
-    implementation(Depends.Libraries.hilt_android)
-    kapt(Depends.Libraries.hilt_android_compiler)
-    kapt(Depends.Libraries.hilt_compiler)
+    implementation(Depends.Libraries.dagger)
+    kapt(Depends.Libraries.dagger_compiler)
+    implementation(Depends.Libraries.dagger_hilt_android)
+    kapt(Depends.Libraries.dagger_hilt_compiler)
+//    kapt(Depends.Libraries.dagger_hilt_android_compiler)
+//    kapt(Depends.Libraries.hilt_androidx_compiler)
+//    implementation(Depends.Libraries.dagger_hilt_core)
     implementation(Depends.Libraries.java_inject)
     //parser
     implementation(Depends.Libraries.gson)

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -61,6 +61,13 @@ dependencies {
     implementation(Depends.Libraries.rx_kotlin)
     implementation(Depends.Libraries.rx_java)
     //dependency injection
+    implementation(Depends.Libraries.dagger)
+    kapt(Depends.Libraries.dagger_compiler)
+    implementation(Depends.Libraries.dagger_hilt_android)
+//    implementation(Depends.Libraries.dagger_hilt_core)
+    kapt(Depends.Libraries.dagger_hilt_compiler)
+//    kapt(Depends.Libraries.dagger_hilt_android_compiler)
+//    kapt(Depends.Libraries.hilt_androidx_compiler)
     implementation(Depends.Libraries.java_inject)
     //test
     testImplementation(Depends.Libraries.junit)

diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -63,9 +63,15 @@ dependencies {
     implementation(Depends.Libraries.kotlin_reflect)
 
     //dependency injection
-    implementation(Depends.Libraries.hilt_android)
-    kapt(Depends.Libraries.hilt_android_compiler)
-    kapt(Depends.Libraries.hilt_compiler)
+    implementation(Depends.Libraries.dagger)
+    kapt(Depends.Libraries.dagger_compiler)
+    implementation(Depends.Libraries.dagger_hilt_android)
+    implementation(Depends.Libraries.dagger_hilt_navigation_compose)
+//    kapt(Depends.Libraries.dagger_hilt_android_compiler)
+//    implementation(Depends.Libraries.dagger_hilt_core)
+    kapt(Depends.Libraries.dagger_hilt_compiler)
+//    kapt(Depends.Libraries.dagger_hilt_android_compiler)
+//    kapt(Depends.Libraries.hilt_androidx_compiler)
     implementation(Depends.Libraries.java_inject)
     //other
     implementation(Depends.Libraries.timber)
@@ -79,7 +85,8 @@ dependencies {
     implementation(Depends.Libraries.paging_rx)
     implementation(Depends.Libraries.lifecycle_livedata_ktx)
     implementation(Depends.Libraries.lifecycle_runtime_ktx)
-    implementation(Depends.Libraries.lifecycle_common)
+    implementation(Depends.Libraries.lifecycle_viewmodel_runtime_ktx)
+    implementation(Depends.Libraries.lifecycle_common_java8)
     implementation(Depends.Libraries.lifecycle_viewmodel_ktx)
     implementation(Depends.Libraries.multidex)
     implementation(Depends.Libraries.android_core_ktx)