[Chore/#236] ktlint가 Android 모듈을 검사하지 않던 문제 수정

.editorconfig

@@ -10,8 +10,14 @@ indent_size = 4
 indent_style = space
 trim_trailing_whitespace = true
 insert_final_newline = true
-tab_width = 4
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
-ktlint_function_naming_ignore_when_annotated_with=Composable
-ktlint_standard_annotation = disabled
+ktlint_code_style = intellij_idea
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_enum_entry_name_casing = upper_cases
+ktlint_standard_class-signature = disabled
+ktlint_standard_statement-wrapping = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_multiline-if-else = disabled

.github/workflows/develop_branch.yml

@@ -59,4 +59,4 @@ jobs:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
       - name: Build and Verify
-        run: ./gradlew ktlintCheck testDebugUnitTest assembleDebug
+        run: ./gradlew ktlintCheck :build-logic:convention:ktlintCheck testDebugUnitTest assembleDebug --continue

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

@@ -105,7 +105,7 @@ fun HomeNavHost(
 
                     composable<HomeRoute.Summary> {
                         SummaryScreenContainer(
-                            navigateToYouthPolicies = {} // todo - 청년공고 화면 구현 후 연결 필요
+                            navigateToYouthPolicies = {}, // todo - 청년공고 화면 구현 후 연결 필요
                         )
                     }
                 }

app/src/main/java/com/threegap/bitnagil/util/version/PackageManagerVersionNameProvider.kt

@@ -10,4 +10,4 @@ class PackageManagerVersionNameProvider @Inject constructor(
 ) : VersionNameProvider {
     override fun getVersionName(): String =
         context.packageManager.getPackageInfo(context.packageName, 0).versionName.orEmpty()
-}
+}

build-logic/convention/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     `kotlin-dsl`
+    alias(libs.plugins.ktlint)
 }
 
 group = "com.threegap.bitnagil.convention"
@@ -14,10 +15,17 @@ kotlin {
     jvmToolchain(17)
 }
 
+ktlint {
+    version.set(libs.versions.ktlintEngine.get())
+    verbose.set(true)
+    filter { exclude { element -> element.file.path.contains("generated/") } }
+}
+
 dependencies {
     compileOnly(libs.android.gradle.plugin)
     compileOnly(libs.kotlin.gradle.plugin)
     compileOnly(libs.compose.compiler.gradle.plugin)
+    compileOnly(libs.ktlint.gradle.plugin)
 }
 
 gradlePlugin {
@@ -56,5 +64,10 @@ gradlePlugin {
             id = "bitnagil.kotlin.parcelize"
             implementationClass = "com.threegap.bitnagil.convention.KotlinParcelizePlugin"
         }
+
+        register("ktlint") {
+            id = "bitnagil.ktlint"
+            implementationClass = "com.threegap.bitnagil.convention.KtlintConventionPlugin"
+        }
     }
 }

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/AndroidApplicationPlugin.kt

@@ -15,7 +15,7 @@ class AndroidApplicationPlugin : Plugin<Project> {
         pluginManager.apply {
             apply("com.android.application")
             apply("org.jetbrains.kotlin.plugin.compose")
-            apply("org.jlleitschuh.gradle.ktlint")
+            apply("bitnagil.ktlint")
         }
 
         extensions.configure<ApplicationExtension> {

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/AndroidLibraryPlugin.kt

@@ -11,7 +11,7 @@ class AndroidLibraryPlugin : Plugin<Project> {
     override fun apply(target: Project): Unit = with(target) {
         pluginManager.apply {
             apply("com.android.library")
-            apply("org.jlleitschuh.gradle.ktlint")
+            apply("bitnagil.ktlint")
         }
 
         extensions.configure<LibraryExtension> {

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/KotlinJvmPlugin.kt

@@ -13,7 +13,7 @@ class KotlinJvmPlugin : Plugin<Project> {
             pluginManager.apply {
                 apply("java-library")
                 apply("org.jetbrains.kotlin.jvm")
-                apply("org.jlleitschuh.gradle.ktlint")
+                apply("bitnagil.ktlint")
             }
         }
 

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/KtlintConventionPlugin.kt

@@ -0,0 +1,19 @@
+package com.threegap.bitnagil.convention
+
+import com.threegap.bitnagil.convention.extension.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.jlleitschuh.gradle.ktlint.KtlintExtension
+
+class KtlintConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project): Unit = with(target) {
+        pluginManager.apply("org.jlleitschuh.gradle.ktlint")
+
+        extensions.configure<KtlintExtension> {
+            version.set(libs.findVersion("ktlintEngine").get().requiredVersion)
+            verbose.set(true)
+            filter { exclude { element -> element.file.path.contains("generated/") } }
+        }
+    }
+}

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/extension/ComposeAndroid.kt

@@ -21,5 +21,4 @@ internal fun Project.configureComposeAndroid(commonExtension: CommonExtension) {
         "implementation"(libs.findBundle("compose.lifecycle").get())
         "debugImplementation"(libs.findBundle("compose.debug").get())
     }
-
 }

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/extension/KotlinAndroid.kt

@@ -42,4 +42,3 @@ internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension) {
         }
     }
 }
-

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/extension/KotlinCoroutine.kt

@@ -4,7 +4,6 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureKotlinCoroutine() {
-
     dependencies {
         "implementation"(libs.findBundle("coroutine").get())
     }

build-logic/convention/src/main/java/com/threegap/bitnagil/convention/extension/LocalProperties.kt

@@ -1,8 +1,8 @@
 package com.threegap.bitnagil.convention.extension
 
-import java.util.Properties
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import java.util.Properties
 
 private const val LOCAL_PROPERTIES_FILE_NAME = "local.properties"
 private const val LOCAL_PROPERTIES_EXTRA_KEY = "bitnagilLocalProperties"

build-logic/settings.gradle.kts

@@ -3,6 +3,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
     versionCatalogs {
         create("libs") {

build.gradle.kts

@@ -8,5 +8,11 @@ plugins {
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
-    alias(libs.plugins.ktlint) apply false
+    alias(libs.plugins.ktlint)
+}
+
+ktlint {
+    version.set(libs.versions.ktlintEngine.get())
+    verbose.set(true)
+    filter { exclude { element -> element.file.path.contains("generated/") } }
 }

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilToastMessage.kt

@@ -96,7 +96,7 @@ class BitnagilToastState {
     private var _icon by mutableIntStateOf(0)
     private var _isVisible by mutableStateOf(false)
     private var _toastId by mutableIntStateOf(0)
-    private var _lastShowTime = 0L
+    private var lastShowTime = 0L
 
     val text: String get() = _text
     val icon: Int get() = _icon
@@ -116,14 +116,14 @@ class BitnagilToastState {
 
     private fun shouldPreventDuplicateShow(text: String, icon: Int?): Boolean {
         val currentTime = System.currentTimeMillis()
-        return _text == text && _icon == icon && currentTime - _lastShowTime < 500L
+        return _text == text && _icon == icon && currentTime - lastShowTime < 500L
     }
 
     private fun showToast(text: String, icon: Int) {
         _text = text
         _icon = icon
         _isVisible = true
-        _lastShowTime = System.currentTimeMillis()
+        lastShowTime = System.currentTimeMillis()
         _toastId += 1
     }
 }

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography/Type.kt

@@ -8,8 +8,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
-import com.threegap.bitnagil.designsystem.font.cafe24SsurroundAir as cafe24SsurroundAirFamily
 import com.threegap.bitnagil.designsystem.font.pretendard
+import com.threegap.bitnagil.designsystem.font.cafe24SsurroundAir as cafe24SsurroundAirFamily
 
 @Immutable
 class BitnagilTypography internal constructor(private val density: Density) {

domain/src/main/java/com/threegap/bitnagil/domain/auth/model/UserRole.kt

@@ -9,5 +9,4 @@ enum class UserRole {
     ONBOARDING,
     WITHDRAWN,
     UNKNOWN,
-    ;
 }

domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendCategory.kt

@@ -12,5 +12,4 @@ enum class RecommendCategory {
     GROW,
     OUTING_REPORT,
     UNKNOWN,
-    ;
 }

domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendLevel.kt

@@ -7,5 +7,4 @@ enum class RecommendLevel {
     LEVEL1,
     LEVEL2,
     LEVEL3,
-    ;
 }

domain/src/main/java/com/threegap/bitnagil/domain/report/model/ReportCategory.kt

@@ -8,5 +8,4 @@ enum class ReportCategory {
     LIGHTING,
     WATERFACILITY,
     AMENITY,
-    ;
 }

domain/src/main/java/com/threegap/bitnagil/domain/report/model/ReportStatus.kt

@@ -7,5 +7,4 @@ enum class ReportStatus {
     PENDING,
     IN_PROGRESS,
     COMPLETED,
-    ;
 }

domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DayOfWeek.kt

@@ -11,5 +11,4 @@ enum class DayOfWeek {
     FRIDAY,
     SATURDAY,
     SUNDAY,
-    ;
 }

gradle/libs.versions.toml

@@ -15,7 +15,8 @@ versionPatch = "0"
 androidGradlePlugin = "9.1.0"
 
 # Formatting Plugin
-ktlint = "11.3.2"
+ktlint = "14.2.0"
+ktlintEngine = "1.5.0"
 
 # AndroidX
 androidxCore = "1.18.0"
@@ -142,6 +143,7 @@ lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", versio
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
 play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" }
 facebook-core = { group = "com.facebook.android", name = "facebook-core", version.ref = "facebookSdk" }
+ktlint-gradle-plugin = { group = "org.jlleitschuh.gradle", name = "ktlint-gradle", version.ref = "ktlint" }
 
 
 [bundles]

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionScreen.kt

@@ -38,7 +38,7 @@ fun EmotionScreenContainer(
     }
 
     when (state.step) {
-        EmotionScreenStep.Emotion -> BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+        EmotionScreenStep.EMOTION -> BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
             val height = constraints.maxHeight.pxToDp()
 
             if (height >= 700.dp) {
@@ -59,7 +59,7 @@ fun EmotionScreenContainer(
                 )
             }
         }
-        EmotionScreenStep.RecommendRoutines -> EmotionRecommendRoutineScreen(
+        EmotionScreenStep.RECOMMEND_ROUTINES -> EmotionRecommendRoutineScreen(
             state = state,
             onClickRoutine = viewModel::selectRecommendRoutine,
             onClickRegisterRecommendRoutines = viewModel::registerRecommendRoutines,

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/EmotionViewModel.kt

@@ -72,7 +72,7 @@ class EmotionViewModel @Inject constructor(
                         reduce {
                             state.copy(
                                 recommendRoutines = recommendRoutines,
-                                step = EmotionScreenStep.RecommendRoutines,
+                                step = EmotionScreenStep.RECOMMEND_ROUTINES,
                                 isLoading = false,
                                 showLoadingView = false,
                             )
@@ -101,11 +101,11 @@ class EmotionViewModel @Inject constructor(
     fun moveToPrev() =
         intent {
             when (state.step) {
-                EmotionScreenStep.Emotion -> postSideEffect(EmotionSideEffect.NavigateToBack)
-                EmotionScreenStep.RecommendRoutines -> reduce {
+                EmotionScreenStep.EMOTION -> postSideEffect(EmotionSideEffect.NavigateToBack)
+                EmotionScreenStep.RECOMMEND_ROUTINES -> reduce {
                     state.copy(
                         recommendRoutines = listOf(),
-                        step = EmotionScreenStep.Emotion,
+                        step = EmotionScreenStep.EMOTION,
                         isLoading = false,
                     )
                 }

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/EmotionRecommendRoutineScreen.kt

@@ -119,7 +119,7 @@ private fun Preview() {
                     ),
                 ),
                 isLoading = false,
-                step = EmotionScreenStep.RecommendRoutines,
+                step = EmotionScreenStep.RECOMMEND_ROUTINES,
                 recommendRoutines = listOf(
                     EmotionRecommendRoutineUiModel(
                         id = "1",

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SimpleEmotionSelectionScreen.kt

@@ -119,7 +119,7 @@ private fun Preview() {
                     ),
                 ),
                 isLoading = false,
-                step = EmotionScreenStep.Emotion,
+                step = EmotionScreenStep.EMOTION,
                 recommendRoutines = listOf(),
                 showLoadingView = false,
             ),

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/component/template/SwipeEmotionSelectionScreen.kt

@@ -457,7 +457,7 @@ private fun Preview() {
                     ),
                 ),
                 isLoading = false,
-                step = EmotionScreenStep.Emotion,
+                step = EmotionScreenStep.EMOTION,
                 recommendRoutines = listOf(),
                 showLoadingView = false,
             ),

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/contract/EmotionState.kt

@@ -21,7 +21,7 @@ data class EmotionState(
             emotionTypeUiModels = emptyList(),
             isLoading = true,
             recommendRoutines = emptyList(),
-            step = EmotionScreenStep.Emotion,
+            step = EmotionScreenStep.EMOTION,
             showLoadingView = false,
         )
     }

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/emotion/model/EmotionScreenStep.kt

@@ -1,6 +1,6 @@
 package com.threegap.bitnagil.presentation.screen.emotion.model
 
 enum class EmotionScreenStep {
-    Emotion, RecommendRoutines,
-    ;
+    EMOTION,
+    RECOMMEND_ROUTINES,
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/home/component/template/CollapsibleHeader.kt

@@ -1,5 +1,6 @@
 package com.threegap.bitnagil.presentation.screen.home.component.template
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -14,7 +15,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.foundation.Image
 import coil3.compose.AsyncImage
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.R

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/onboarding/model/navarg/OnBoardingScreenArg.kt

@@ -1,6 +1,6 @@
 package com.threegap.bitnagil.presentation.screen.onboarding.model.navarg
 
 enum class OnBoardingScreenArg {
-    NEW, RESET,
-    ;
+    NEW,
+    RESET,
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/screen/routinewrite/model/RepeatType.kt

@@ -5,5 +5,6 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 enum class RepeatType : Parcelable {
-    DAILY, DAY
+    DAILY,
+    DAY,
 }