[fix] ktlint 설정 변경 (#42)

* [chore] subproject 임시 의존성 comment * [fix/build] .editorconfig ktlint ij 버전 관련 코드 삭제 * [build] all Project에 ktlint 적용 * [refactor] 모든 모듈 ktlint 적용 * [fix/build] .editorConfigure 추가 * [refactor] 모든 모듈 android ktlint 적용
Nexters · Feb 6, 2024 · c32eb24 · c32eb24
1 parent d3d1068
commit c32eb24
Show file tree

Hide file tree

Showing 65 changed files with 639 additions and 649 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,29 +15,7 @@ tab_width = 2
 indent_size = 2
 
 [*.{kt,kts}]
-
 indent_size = 4
 tab_width = 4
-
-# Options for IntelliJ IDEA settings
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-
-ij_kotlin_line_comment_at_first_column = false
-ij_kotlin_line_comment_add_space = true
-
-# These options can keep to use single name import
-ij_kotlin_name_count_to_use_star_import = 2147483647
-ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
-
-ij_kotlin_keep_blank_lines_in_declarations = 1
-ij_kotlin_keep_blank_lines_in_code = 1
-ij_kotlin_keep_blank_lines_before_right_brace = 0
-
-# optional but recommended
-ij_kotlin_align_multiline_parameters = false
-ij_continuation_indent_size = 4
-# https://kotlinlang.org/docs/coding-conventions.html#trailing-commas
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_packages_to_use_import_on_demand = unset
-ij_kotlin_allow_trailing_comma_on_call_site = unset
+ktlint_code_style = android_studio
 ktlint_function_naming_ignore_when_annotated_with=Composable, Test
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.funch.application)
     alias(libs.plugins.funch.compose)
-    alias(libs.plugins.ktlint)
 //    alias(libs.plugins.google.services)
 //    alias(libs.plugins.app.distribution)
 //    alias(libs.plugins.crashlytics)
@@ -25,7 +24,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
+                "proguard-rules.pro"
             )
         }
     }

diff --git a/app/src/main/java/com/moya/funch/FunchApplication.kt b/app/src/main/java/com/moya/funch/FunchApplication.kt
@@ -18,7 +18,7 @@ class FunchApplication : Application() {
                     override fun createStackElementTag(element: StackTraceElement): String {
                         return "${element.fileName} : ${element.lineNumber} - ${element.methodName}"
                     }
-                },
+                }
             )
         }
     }

diff --git a/app/src/main/java/com/moya/funch/navigation/FunchNavHost.kt b/app/src/main/java/com/moya/funch/navigation/FunchNavHost.kt
@@ -6,21 +6,18 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 
 @Composable
-fun FunchNavHost(
-    hasProfile: Boolean,
-    navController: NavHostController = rememberNavController(),
-) {
+fun FunchNavHost(hasProfile: Boolean, navController: NavHostController = rememberNavController()) {
     NavHost(
         navController = navController,
-        startDestination = determineStartDestination(hasProfile),
+        startDestination = determineStartDestination(hasProfile)
     ) {
         profileGraph(
             onNavigateToHome = navController::navigateToHome,
-            onCloseMyProfile = navController::closeMyProfile,
+            onCloseMyProfile = navController::closeMyProfile
         )
         homeScreen(
             onNavigateToMatching = { /* @Gun Hyung TODO : 매칭 라우터 연결 */ },
-            onNavigateToMyProfile = navController::navigateToMyProfile,
+            onNavigateToMyProfile = navController::navigateToMyProfile
         )
     }
 }

diff --git a/app/src/main/java/com/moya/funch/ui/FunchApp.kt b/app/src/main/java/com/moya/funch/ui/FunchApp.kt
@@ -13,10 +13,10 @@ fun FunchApp() {
 
     Surface(
         modifier = Modifier.fillMaxSize(),
-        color = backgroundColor,
+        color = backgroundColor
     ) {
         FunchNavHost(
-            hasProfile = false,
+            hasProfile = false
         )
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jlleitschuh.gradle.ktlint.KtlintExtension
+
 buildscript {
     repositories {
         google()
@@ -28,6 +30,24 @@ plugins {
 //    alias(libs.plugins.crashlytics) apply false
 }
 
+subprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint") // Version should be inherited from parent
+
+    configure<KtlintExtension> {
+        filter {
+            exclude { element -> element.file.path.contains("generated/") }
+        }
+        android.set(true)
+        coloredOutput.set(true)
+        verbose.set(true)
+        outputToConsole.set(true)
+        reporters {
+            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
+            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
+        }
+    }
+}
+
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    alias(libs.plugins.ktlint)
     alias(libs.plugins.funch.android.library)
     alias(libs.plugins.funch.junit5)
 }

diff --git a/core/data/src/main/java/com/moya/funch/mapper/DummyMapper.kt b/core/data/src/main/java/com/moya/funch/mapper/DummyMapper.kt
@@ -3,39 +3,36 @@ package com.moya.funch.mapper
 // network response
 data class DummyDto(
     val id: Int,
-    val name: String,
+    val name: String
 )
 
 // database entity
 data class DummyEntity(
     val id: Int,
-    val name: String,
+    val name: String
 )
 
 // domain model
 data class DummyDomain(
     val id: Int,
-    val name: String,
+    val name: String
 )
 
 // toDomain() 함수
-fun DummyDto.toDomain(): DummyDomain =
-    DummyDomain(
-        id = this.id,
-        name = name,
-    )
+fun DummyDto.toDomain(): DummyDomain = DummyDomain(
+    id = this.id,
+    name = name
+)
 
 // toDto() 함수
-fun DummyDomain.toDto(): DummyDto =
-    DummyDto(
-        id = this.id,
-        name = name,
-    )
+fun DummyDomain.toDto(): DummyDto = DummyDto(
+    id = this.id,
+    name = name
+)
 
 // toEntity() 함수
 
-fun DummyDto.toEntity(): DummyEntity =
-    DummyEntity(
-        id = this.id,
-        name = name,
-    )
+fun DummyDto.toEntity(): DummyEntity = DummyEntity(
+    id = this.id,
+    name = name
+)
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    // alias(libs.plugins.ktlint)
     alias(libs.plugins.funch.android.library)
 }
 

diff --git a/core/datastore/src/main/java/com/moya/funch/datastore/DefaultUserCodeDataStore.kt b/core/datastore/src/main/java/com/moya/funch/datastore/DefaultUserCodeDataStore.kt
@@ -13,9 +13,8 @@ import javax.inject.Singleton
 @Singleton
 class DefaultUserCodeDataStore @Inject constructor(
     private val preferences: SharedPreferences,
-    @ApplicationContext private val context: Context,
+    @ApplicationContext private val context: Context
 ) : UserCodeDataStore {
-
     override var deviceId: String
         get() {
             initDeviceId()

diff --git a/core/datastore/src/main/java/com/moya/funch/datastore/PreferenceFactory.kt b/core/datastore/src/main/java/com/moya/funch/datastore/PreferenceFactory.kt
@@ -11,7 +11,7 @@ import java.security.KeyStore
 import javax.inject.Inject
 
 class PreferenceFactory @Inject constructor(
-    @ApplicationContext private val context: Context,
+    @ApplicationContext private val context: Context
 ) {
     fun create(): SharedPreferences {
         return if (BuildConfig.DEBUG) {
@@ -27,10 +27,7 @@ class PreferenceFactory @Inject constructor(
         }
     }
 
-    private fun createEncryptedSharedPreferences(
-        fileName: String,
-        context: Context,
-    ): SharedPreferences {
+    private fun createEncryptedSharedPreferences(fileName: String, context: Context): SharedPreferences {
         return EncryptedSharedPreferences.create(
             context,
             fileName,
@@ -39,7 +36,6 @@ class PreferenceFactory @Inject constructor(
                 .build(),
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-
         )
     }
 

diff --git a/core/datastore/src/main/java/com/moya/funch/datastore/UserCodeDataStore.kt b/core/datastore/src/main/java/com/moya/funch/datastore/UserCodeDataStore.kt
@@ -1,7 +1,6 @@
 package com.moya.funch.datastore
 
 interface UserCodeDataStore {
-
     var userId: String
     var userCode: String
     var deviceId: String

diff --git a/core/datastore/src/main/java/com/moya/funch/datastore/di/DataStoreModule.kt b/core/datastore/src/main/java/com/moya/funch/datastore/di/DataStoreModule.kt
@@ -14,17 +14,13 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object DataStoreModule {
-
     @Provides
     @Singleton
-    fun provideAppPreferences(
-        factory: PreferenceFactory,
-    ): SharedPreferences = factory.create()
+    fun provideAppPreferences(factory: PreferenceFactory): SharedPreferences = factory.create()
 
     @Module
     @InstallIn(SingletonComponent::class)
     abstract class Binder {
-
         @Binds
         abstract fun bindAppPreferences(dataStore: DefaultUserCodeDataStore): UserCodeDataStore
     }

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -6,4 +6,3 @@ plugins {
 android {
     namespace = "com.moya.funch.designsystem"
 }
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ class FunchApplication : Application() { @@
                         override fun createStackElementTag(element: StackTraceElement): String {
                             return "${element.fileName} : ${element.lineNumber} - ${element.methodName}"
                         }
-                    },
+                    }
                 )
             }
         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ plugins {
		android {
		namespace = "com.moya.funch.designsystem"
		}