fix room and detekt bugs

cnrture · Dec 3, 2024 · 3dd48df · 3dd48df
1 parent 05ac132
commit 3dd48df
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/Extensions.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/Extensions.kt
@@ -94,12 +94,12 @@ fun StringBuilder.addDetektBlock() {
 fun StringBuilder.addAndroidBlock(packageName: String, minApi: Int, javaJvmVersion: String, isCompose: Boolean) {
     append("android {\n")
     append("    namespace = \"${packageName}\"\n")
-    append("    compileSdk = 34\n\n")
+    append("    compileSdk = 35\n\n")
     append("    android.buildFeatures.buildConfig = true\n\n")
     append("    defaultConfig {\n")
     append("        applicationId = \"${packageName}\"\n")
     append("        minSdk = $minApi\n")
-    append("        targetSdk = 34\n")
+    append("        targetSdk = 35\n")
     append("        versionCode = 1\n")
     append("        versionName = \"1.0\"\n\n")
     append("        testInstrumentationRunner = \"androidx.test.runner.AndroidJUnitRunner\"\n")

diff --git a/.../com/github/cnrture/quickprojectwizard/general/data/repository/EmptyMainRepositoryImpl.kt b/.../com/github/cnrture/quickprojectwizard/general/data/repository/EmptyMainRepositoryImpl.kt
@@ -21,50 +21,50 @@ fun emptyMainRepositoryImpl(
 private fun serviceRoomHilt(packageName: String) = """
     package $packageName.data.repository
             
-    import $packageName.data.source.local.MainRoomDB
+    import $packageName.data.source.local.MainDao
     import $packageName.data.source.remote.MainService
     import $packageName.domain.repository.MainRepository
     import javax.inject.Inject
             
     class MainRepositoryImpl @Inject constructor(
         private val mainService: MainService,
-        private val mainRoomDB: MainRoomDB,
+        private val mainDao: MainDao,
     ) : MainRepository
 """.trimIndent()
 
 private fun serviceRoom(packageName: String) = """
     package $packageName.data.repository
             
-    import $packageName.data.source.local.MainRoomDB
+    import $packageName.data.source.local.MainDao
     import $packageName.data.source.remote.MainService
     import $packageName.domain.repository.MainRepository
             
     class MainRepositoryImpl(
         private val mainService: MainService,
-        private val mainRoomDB: MainRoomDB,
+        private val mainDao: MainDao,
     ) : MainRepository
 """.trimIndent()
 
 private fun roomHilt(packageName: String) = """
     package $packageName.data.repository
             
-    import $packageName.data.local.MainRoomDB
+    import $packageName.data.local.MainDao
     import $packageName.domain.repository.MainRepository
     import javax.inject.Inject
             
     class MainRepositoryImpl @Inject constructor(
-        private val mainRoomDB: MainRoomDB,
+        private val mainDao: MainDao,
     ) : MainRepository
 """.trimIndent()
 
 private fun room(packageName: String) = """
     package $packageName.data.repository
             
-    import $packageName.data.local.MainRoomDB
+    import $packageName.data.local.MainDao
     import $packageName.domain.repository.MainRepository
             
     class MainRepositoryImpl(
-        private val mainRoomDB: MainRoomDB,
+        private val mainDao: MainDao,
     ) : MainRepository
 """.trimIndent()
 

diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/di/EmptyLocalModule.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/di/EmptyLocalModule.kt
@@ -5,7 +5,6 @@ package $packageName.di
 
 import android.content.Context
 import androidx.room.Room
-import androidx.room.RoomDatabase
 import $packageName.data.source.local.MainDao
 import $packageName.data.source.local.MainRoomDB
 import dagger.Module
@@ -19,7 +18,7 @@ import dagger.hilt.components.SingletonComponent
 object LocalModule {
 
     @Provides
-    fun provideRoomDatabase(@ApplicationContext context: Context): RoomDatabase {
+    fun provideRoomDatabase(@ApplicationContext context: Context): MainRoomDB {
         return Room.databaseBuilder(
             context,
             MainRoomDB::class.java,

diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Library.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Library.kt
@@ -57,9 +57,8 @@ sealed class Library(val libName: String, val group: String, val name: String, v
 
     data object NavigationFragment :
         Library("navigation-fragment", "androidx.navigation", "navigation-fragment-ktx", "navigation")
-
     data object NavigationUi : Library("navigation-ui", "androidx.navigation", "navigation-ui-ktx", "navigation")
-    data object Detekt : Library("detekt", "io.gitlab.arturbosch", "detekt", "detekt")
+    data object Detekt : Library("detekt-formatting", "io.gitlab.arturbosch", "detekt-formatting", "detekt")
     data object Firebase : Library("firebase", "com.google.firebase", "firebase-bom", "firebase")
     data object WorkManager : Library("workManager", "androidx.work", "work-runtime-ktx", "workManagerVersion")
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Plugin.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Plugin.kt
@@ -7,6 +7,6 @@ sealed class Plugin(val name: String, val id: String, val verRef: String) {
     data object Ksp : Plugin("ksp", "com.google.devtools.ksp", "ksp")
     data object Hilt : Plugin("hilt-plugin", "com.google.dagger.hilt.android", "hilt")
     data object KtLint : Plugin("ktlint", "org.jlleitschuh.gradle.ktlint", "ktlint")
-    data object Detekt : Plugin("detekt", "io.gitlab.arturbosch.detekt", "detekt")
+    data object Detekt : Plugin("detekt-plugin", "io.gitlab.arturbosch.detekt", "detekt")
     data object GoogleServices : Plugin("google-services", "com.google.gms.google-services", "googleServices")
 }