[init] #8 Detekt 설정

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+max_line_length = 150
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true

.github/workflows/android-ci.yml

@@ -49,9 +49,9 @@ jobs:
 #        run: |
 #          echo '${{ secrets.GOOGLE_SERVICES }}' >> ./app/google-services.json
 
-#      - name: Code style checks
-#        run: |
-#          ./gradlew detekt --continue
+      - name: Code style checks
+        run: |
+          ./gradlew detekt --continue
 
       - name: Run build
         run: ./gradlew buildDebug --stacktrace

app/src/main/java/com/neki/android/app/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : ComponentActivity() {
                             currentKey = navigator.state.currentKey,
                             onTabSelected = { navigator.navigate(it.navKey) },
                         )
-                    }
+                    },
                 ) { innerPadding ->
                     NavDisplay(
                         modifier = Modifier.padding(innerPadding),

app/src/main/java/com/neki/android/app/NekiApplication.kt

@@ -5,20 +5,20 @@ import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
 @HiltAndroidApp
-class NekiApplication: Application() {
+class NekiApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         } else {
-            Timber.plant(object : Timber.Tree() {
-                override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-                    // 여기는 Release일 때 로그를 남기지 않고 어딘가로 전송 ?
-
-                }
-            })
+            Timber.plant(
+                object : Timber.Tree() {
+                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+                        // 여기는 Release일 때 로그를 남기지 않고 어딘가로 전송 ?
+                    }
+                },
+            )
         }
-
     }
-}
+}

app/src/main/java/com/neki/android/app/navigation/TopLevelNavItem.kt

@@ -24,16 +24,17 @@ enum class TopLevelNavItem(
         selectedIcon = R.drawable.ic_nav_archive_selected,
         unselectedIcon = R.drawable.ic_nav_archive_unselected,
         iconTextId = R.string.top_level_nav_archive,
-        navKey = ArchiveNavKey.Archive
+        navKey = ArchiveNavKey.Archive,
     ),
     MAP(
         selectedIcon = R.drawable.ic_nav_map_selected,
         unselectedIcon = R.drawable.ic_nav_map_unselected,
         iconTextId = R.string.top_level_nav_map,
-        navKey = MapNavKey.Map
-    );
+        navKey = MapNavKey.Map,
+    ),
+    ;
 
     companion object {
         val startTopLevelItem = ARCHIVE
     }
-}
+}

app/src/main/java/com/neki/android/app/navigation/di/AppModule.kt

@@ -15,4 +15,4 @@ internal interface AppModule {
     fun bindsNavigator(
         impl: NavigatorImpl,
     ): Navigator
-}
+}

app/src/main/java/com/neki/android/app/navigation/di/NavigationModule.kt

@@ -21,4 +21,4 @@ internal object NavigationModule {
             topLevelKeys = TOP_LEVEL_NAV_KEYS.toSet(),
         )
     }
-}
+}

app/src/main/java/com/neki/android/app/ui/BottomNavigationBar.kt

@@ -51,14 +51,14 @@ fun BottomNavigationBar(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 20.dp),
-                horizontalArrangement = Arrangement.spacedBy(2.5.dp)
+                horizontalArrangement = Arrangement.spacedBy(2.5.dp),
             ) {
                 tabs.forEach { tab ->
                     BottomNavigationBarItem(
                         modifier = Modifier.weight(1f),
                         selected = tab.navKey == currentTab,
                         tab = tab,
-                        onClick = { if (tab.navKey != currentKey) onTabSelected(tab) }
+                        onClick = { if (tab.navKey != currentKey) onTabSelected(tab) },
                     )
                 }
             }
@@ -78,7 +78,7 @@ fun BottomNavigationBarItem(
 
     Surface(
         modifier = modifier,
-        onClick = onClick
+        onClick = onClick,
     ) {
         Column(
             modifier = Modifier.padding(vertical = 8.dp),

build-logic/src/main/java/com/neki/android/buildlogic/extensions/Android.kt

@@ -4,10 +4,12 @@ import com.neki.android.buildlogic.const.BuildConst
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import kotlin.text.get
 
 internal fun Project.configureAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *, *>
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = BuildConst.COMPILE_SDK
@@ -30,6 +32,10 @@ internal fun Project.configureAndroid(
                 )
             }
         }
+
+        dependencies {
+            add("detektPlugins", libs.findLibrary("detekt.formatting").get())
+        }
     }
 }
 

build-logic/src/main/java/com/neki/android/buildlogic/plugins/KotlinLibraryConventionPlugin.kt

@@ -1,8 +1,10 @@
 import com.neki.android.buildlogic.const.BuildConst
+import com.neki.android.buildlogic.extensions.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
 class KotlinLibraryConventionPlugin: Plugin<Project> {
@@ -21,6 +23,10 @@ class KotlinLibraryConventionPlugin: Plugin<Project> {
             extensions.configure<KotlinProjectExtension> {
                 jvmToolchain(BuildConst.JDK_VERSION)
             }
+
+            dependencies {
+                add("detektPlugins", libs.findLibrary("detekt.formatting").get())
+            }
         }
     }
 }

build.gradle.kts

@@ -1,3 +1,6 @@
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.kotlin.dsl.configure
+
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
@@ -7,4 +10,18 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.jvm) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.detekt) apply false
+}
+
+subprojects {
+    apply {
+        plugin(rootProject.libs.plugins.detekt.get().pluginId)
+    }
+
+    configure<DetektExtension> {
+        parallel = true
+        buildUponDefaultConfig = true
+        toolVersion = rootProject.libs.versions.detekt.get()
+        config.setFrom(files("$rootDir/detekt-config.yml"))
+    }
 }

core/common/src/main/java/com/neki/android/core/common/const/Const.kt

@@ -2,5 +2,4 @@ package com.neki.android.core.common.const
 
 object Const {
     const val TAG_REST_API = "TAG_REST_API"
-
-}
+}

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/SampleRespository.kt

@@ -5,8 +5,6 @@ import com.neki.android.core.model.Post
 interface SampleRepository {
     suspend fun getPosts(): List<Post>
     suspend fun getPost(
-        id: Int
+        id: Int,
     ): Post
-
-
-}
+}

core/data/src/main/java/com/neki/android/core/data/local/di/DataStoreRepository.kt

@@ -22,7 +22,7 @@ internal object DataStoreModule {
     @Singleton
     @Provides
     fun provideDataStore(
-        @ApplicationContext context: Context
+        @ApplicationContext context: Context,
     ): DataStore<Preferences> {
         return PreferenceDataStoreFactory.create(
             corruptionHandler = ReplaceFileCorruptionHandler(
@@ -31,6 +31,4 @@ internal object DataStoreModule {
             produceFile = { context.preferencesDataStoreFile(DATASTORE_NAME) },
         )
     }
-
-
-}
+}

core/data/src/main/java/com/neki/android/core/data/remote/api/ApiService.kt

@@ -6,7 +6,7 @@ import io.ktor.client.call.body
 import io.ktor.client.request.get
 
 class ApiService(
-    private val client: HttpClient
+    private val client: HttpClient,
 ) {
     // 게시글 목록 조회
     suspend fun getPosts(): List<PostResponse> {
@@ -15,10 +15,8 @@ class ApiService(
 
     // 게시글 조회
     suspend fun getPost(
-        id: Int
+        id: Int,
     ): PostResponse {
         return client.get("/posts/$id").body()
     }
-
-
 }

core/data/src/main/java/com/neki/android/core/data/remote/di/NetworkModule.kt

@@ -21,6 +21,7 @@ import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 import javax.inject.Singleton
+
 @Module
 @InstallIn(SingletonComponent::class)
 internal object NetworkModule {
@@ -31,7 +32,7 @@ internal object NetworkModule {
     @Provides
     @Singleton
     fun provideApiService(
-        client: HttpClient
+        client: HttpClient,
     ): ApiService = ApiService(client)
 
     @Provides
@@ -44,11 +45,13 @@ internal object NetworkModule {
             }
 
             install(ContentNegotiation) {
-                json(Json {
-                    prettyPrint = true
-                    isLenient = true
-                    ignoreUnknownKeys = true
-                })
+                json(
+                    Json {
+                        prettyPrint = true
+                        isLenient = true
+                        ignoreUnknownKeys = true
+                    },
+                )
             }
 
             install(Logging) {
@@ -69,7 +72,4 @@ internal object NetworkModule {
             expectSuccess = true
         }
     }
-
-
 }
-

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PostResponse.kt

@@ -9,14 +9,14 @@ data class PostResponse(
     @SerialName("userId") val userId: Int,
     @SerialName("id") val id: Int,
     @SerialName("title") val title: String,
-    @SerialName("body") val body: String
+    @SerialName("body") val body: String,
 ) {
     fun toModel(): Post {
         return Post(
             userId = this.userId,
             id = this.id,
             title = this.title,
-            body = this.body
+            body = this.body,
         )
     }
-}
+}

core/data/src/main/java/com/neki/android/core/data/repository/di/RepositoryModule.kt

@@ -13,8 +13,6 @@ internal abstract class RepositoryModule {
 
     @Binds
     abstract fun bindSampleRepositoryImpl(
-        sampleRepositoryImpl: SampleRepositoryImpl
+        sampleRepositoryImpl: SampleRepositoryImpl,
     ): SampleRepository
-
-
-}
+}

core/data/src/main/java/com/neki/android/core/data/repository/impl/SampleRepositoryImpl.kt

@@ -1,27 +1,23 @@
 package com.neki.android.core.data.repository.impl
 
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
 import com.neki.android.core.data.remote.api.ApiService
 import com.neki.android.core.dataapi.repository.SampleRepository
 import com.neki.android.core.model.Post
 import javax.inject.Inject
 
 class SampleRepositoryImpl @Inject constructor(
     private val apiService: ApiService,
-    private val dataStore: DataStore<Preferences>
-): SampleRepository {
+//    private val dataStore: DataStore<Preferences>,
+) : SampleRepository {
     override suspend fun getPosts(): List<Post> {
         return apiService.getPosts()
             .map { it.toModel() }
     }
 
     override suspend fun getPost(
-        id: Int
+        id: Int,
     ): Post {
         return apiService.getPost(id = id)
             .toModel()
     }
-
-
-}
+}

core/designsystem/src/main/java/com/neki/android/core/designsystem/ui/theme/Color.kt

@@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val Pink40 = Color(0xFF7D5260)