Skip to content

Commit 0b97d50

Browse files
authored
Merge pull request #52 from Go-Socket-Project/feature/51_detekt_logic_refactoring
🔀 :: (#51) detekt logic refactoring
2 parents 9a10fea + 7975747 commit 0b97d50

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

app/src/main/java/com/chat/go_socket/GoSocketApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import android.app.Application
44
import dagger.hilt.android.HiltAndroidApp
55

66
@HiltAndroidApp
7-
class GoSocketApplication: Application()
7+
class GoSocketApplication : Application()

app/src/main/java/com/chat/go_socket/MainActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ package com.chat.go_socket
33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
6-
import androidx.compose.material3.Text
76
import dagger.hilt.android.AndroidEntryPoint
87

98
@AndroidEntryPoint
109
class MainActivity : ComponentActivity() {
1110
override fun onCreate(savedInstanceState: Bundle?) {
1211
super.onCreate(savedInstanceState)
1312
setContent {
14-
13+
// TODO: NavHost 작업 수행
1514
}
1615
}
17-
}
16+
}

app/src/test/java/com/chat/go_socket/ExampleUnitTest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.chat.go_socket
22

33
import org.junit.Test
4-
5-
import org.junit.Assert.*
4+
import org.junit.Assert.assertEquals
65

76
/**
87
* Example local unit test, which will execute on the development machine (host).
@@ -14,4 +13,4 @@ class ExampleUnitTest {
1413
fun addition_isCorrect() {
1514
assertEquals(4, 2 + 2)
1615
}
17-
}
16+
}

build-logic/src/main/kotlin/convention.android.application.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id("com.android.application")
66
kotlin("android")
77
kotlin("plugin.compose")
8+
id("convention.verify.detekt")
89
}
910

1011
android {
@@ -40,4 +41,4 @@ android {
4041
excludes += "/META-INF/{AL2.0,LGPL2.1}"
4142
}
4243
}
43-
}
44+
}

build-logic/src/main/kotlin/convention.android.library.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import com.chat.build_logic.configureKotlinAndroid
33
plugins {
44
id("com.android.library")
55
kotlin("android")
6-
id("convention.verify.detekt")
76
}
87

98
android {
@@ -22,4 +21,4 @@ android {
2221
)
2322
}
2423
}
25-
}
24+
}

build-logic/src/main/kotlin/convention.verify.detekt.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import io.gitlab.arturbosch.detekt.Detekt
44
configureVerifyDetekt()
55

66
tasks.withType<Detekt>().configureEach {
7-
jvmTarget = "17"
8-
97
buildUponDefaultConfig = true // 기본 설정에서 추가 설정만 덮어쓰기
10-
allRules = false // 모든 룰을 활성화 할지 설정
118
parallel = true // 코드 분석 병렬 실행 설정
129
config = files("$rootDir/config/detekt/detekt.yml")
13-
}
10+
}

0 commit comments

Comments
 (0)