Skip to content

Commit 291b892

Browse files
committed
[NDGL-16] chore: ktlint 버전 변경 및 적용
1 parent ab3d42a commit 291b892

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

app/src/main/java/com/yapp/ndgl/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
66
import androidx.activity.enableEdgeToEdge
7-
import com.yapp.ui.theme.NDGLTheme
87
import com.yapp.ndgl.ui.NDGLApp
8+
import com.yapp.ui.theme.NDGLTheme
99
import dagger.hilt.android.AndroidEntryPoint
1010

1111
@AndroidEntryPoint

app/src/main/java/com/yapp/ndgl/ui/BottomNavigationBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import androidx.compose.material3.Text
77
import androidx.compose.runtime.Composable
88
import androidx.compose.ui.graphics.vector.ImageVector
99
import androidx.compose.ui.res.vectorResource
10-
import com.yapp.ndgl.navigation.BottomNavTab
1110
import com.yapp.navigation.Route
11+
import com.yapp.ndgl.navigation.BottomNavTab
1212

1313
@Composable
1414
internal fun BottomNavigationBar(

app/src/main/java/com/yapp/ndgl/ui/NDGLApp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import androidx.compose.runtime.remember
99
import androidx.compose.ui.Modifier
1010
import androidx.navigation3.runtime.entryProvider
1111
import androidx.navigation3.ui.NavDisplay
12-
import com.yapp.travel.helper.navigation.travelHelperEntry
1312
import com.yapp.home.navigation.homeEntry
14-
import com.yapp.ndgl.navigation.BottomNavTab
1513
import com.yapp.navigation.Navigator
1614
import com.yapp.navigation.Route
1715
import com.yapp.navigation.rememberNavigationState
1816
import com.yapp.navigation.toEntries
17+
import com.yapp.ndgl.navigation.BottomNavTab
18+
import com.yapp.travel.helper.navigation.travelHelperEntry
1919
import com.yapp.travel.navigation.travelEntry
2020

2121
@Composable

core/ui/src/main/java/com/yapp/ui/base/BaseViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import kotlinx.coroutines.channels.Channel.Factory.BUFFERED
1717
import kotlinx.coroutines.flow.MutableStateFlow
1818
import kotlinx.coroutines.flow.asStateFlow
1919
import kotlinx.coroutines.flow.receiveAsFlow
20-
import kotlinx.coroutines.launch
2120
import kotlinx.coroutines.flow.update
21+
import kotlinx.coroutines.launch
2222
import kotlinx.coroutines.withContext
2323

2424
abstract class BaseViewModel<S : UiState, I : UiIntent, SE : UiSideEffect>(

feature/travel-helper/src/main/java/com/yapp/travel/helper/navigation/TravelHelperEntry.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.yapp.travel.helper.navigation
22

33
import androidx.navigation3.runtime.EntryProviderScope
44
import androidx.navigation3.runtime.NavKey
5-
import com.yapp.travel.helper.TravelHelperRoute
65
import com.yapp.navigation.Navigator
76
import com.yapp.navigation.Route
7+
import com.yapp.travel.helper.TravelHelperRoute
88

99
fun EntryProviderScope<NavKey>.travelHelperEntry(navigator: Navigator) {
1010
entry<Route.TravelHelper> {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ material = "1.13.0"
4646

4747
# Static Analysis
4848
detekt = "1.23.8"
49-
ktlint-gradle = "14.0.1"
50-
ktlint-source = "1.8.0" #https://github.com/pinterest/ktlint/releases
49+
ktlint-gradle = "12.1.1"
50+
ktlint-source = "0.50.0" #https://github.com/pinterest/ktlint/releases
5151

5252
[libraries]
5353
# AndroidX

0 commit comments

Comments
 (0)