-
Notifications
You must be signed in to change notification settings - Fork 1
[CT-1-2] hilt 추가, ktlint 추가, buildSrc 작성 #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
f-lab-nathan
merged 17 commits into
feature/ct-1-initial-project-setup
from
feature/ct-1-2-dependencies
May 11, 2024
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
8e7b27a
[CT-1-1] 프로젝트 생성 및 gitignore 적용
nosorae ebbbcbf
[CT-1-1] 프로젝트 생성 후 compileSdk와 라이브러리 버전 호환 에러 해소
nosorae f556420
[CT-1-1] domain 모듈 추가
nosorae f53c047
[CT-1-1] data 모듈 추가
nosorae 467ebc8
[CT-1-1] presentation 모듈 추가
nosorae f3ed153
[CT-1-1] 모듈간 의존성 설정
nosorae d0d2118
[CT-1-2] ktlint 설정 및 코드 스타일 적용 시작
nosorae 8565cd7
[CT-1-2] PR시 실행할 Github Action YML파일 추가
nosorae 9634725
[CT-1-2] hilt 의존성 추가 및 초기 앱모듈 세팅
nosorae e259b73
[CT-1-2] buildSrc 추가 및 적용, 불필요 의존성 제거
nosorae a93006b
[CT-1-2] ktlintFormat
nosorae fbf9854
[CT-1-2] JDK 버전 호환 문제로 인한 yml 파일 수정 (action/job name 이름 수정)
nosorae 1c49c59
[CT-1-2] 배포자 지정
nosorae a65c806
[CT-1-2] 배포자 수정, 순서 수정
nosorae 7621034
[CT-1-2] 일단 Action 제거, 추후 테스트 완료하고 다시 추가 예정
nosorae 45f33bb
Merge branch 'feature/ct-1-1-gitignore-and-module' into feature/ct-1-…
nosorae e0c439d
[CT-1-2] 중복코드 삭제
nosorae File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/src/main/java/com/yessorae/chartrainer/CharTrainerApplication.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package com.yessorae.chartrainer | ||
|
||
import android.app.Application | ||
import dagger.hilt.android.HiltAndroidApp | ||
|
||
@HiltAndroidApp | ||
class CharTrainerApplication : Application() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
// Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
plugins { | ||
id("com.android.application") version "8.1.2" apply false | ||
id("org.jetbrains.kotlin.android") version "1.8.10" apply false | ||
id("org.jetbrains.kotlin.jvm") version "1.8.10" apply false | ||
id("com.android.library") version "8.1.2" apply false | ||
} | ||
id(Plugin.ANDROID_APPLICATION) version Plugin.Version.ANDROID_APPLICATION apply false | ||
id(Plugin.KOTLIN_ANDROID) version Plugin.Version.KOTLIN_ANDROID apply false | ||
id(Plugin.KOTLIN_JVM) version Plugin.Version.KOTLIN_JVM apply false | ||
id(Plugin.ANDROID_LIBRARY) version Plugin.Version.ANDROID_LIBRARY apply false | ||
id(Plugin.KTLINT) version Plugin.Version.KTLINT | ||
id(Plugin.HILT) version Plugin.Version.HILT apply false | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
plugins { | ||
`kotlin-dsl` | ||
} | ||
|
||
repositories { | ||
google() | ||
mavenCentral() | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
object Config { | ||
const val COMPOSE_COMPILER_VERSION = "1.4.3" | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
object Dependency { | ||
const val HILT = "com.google.dagger:hilt-android:2.44" | ||
const val HILT_COMPILER = "com.google.dagger:hilt-android-compiler:2.44" | ||
const val JAVAX_INJECT = "javax.inject:javax.inject:1" | ||
|
||
const val ANDROIDX_CORE = "androidx.core:core-ktx:1.9.0" // 1.13.1 | ||
|
||
object Compose { | ||
const val BOM = "androidx.compose:compose-bom:2023.03.00" | ||
const val UI = "androidx.compose.ui:ui" | ||
const val UI_GRAPHICS = "androidx.compose.ui:ui-graphics" | ||
const val MATERIAL_3 = "androidx.compose.material3:material3" | ||
const val LIFECYCLE_RUNTIME = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0" | ||
const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:1.8.2" | ||
|
||
const val UI_TOOLING = "androidx.compose.ui:ui-tooling" | ||
const val UI_TOOLING_PREVIEW = "androidx.compose.ui:ui-tooling-preview" | ||
const val JUNIT = "androidx.compose.ui:ui-test-junit4" | ||
const val UI_TEST_MANIFEST = "androidx.compose.ui:ui-test-manifest" | ||
} | ||
|
||
object Test { | ||
const val JUNIT = "junit:junit:4.13.2" | ||
const val JUNIT_EXT = "androidx.test.ext:junit:1.1.5" | ||
} | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
object Plugin { | ||
const val ANDROID_APPLICATION = "com.android.application" | ||
const val KOTLIN_JVM = "org.jetbrains.kotlin.jvm" | ||
const val KOTLIN_ANDROID = "org.jetbrains.kotlin.android" | ||
const val ANDROID_LIBRARY = "com.android.library" | ||
const val KTLINT = "org.jlleitschuh.gradle.ktlint" | ||
const val HILT = "com.google.dagger.hilt.android" | ||
const val KAPT = "kapt" | ||
|
||
object Version { | ||
const val ANDROID_APPLICATION = "8.1.2" | ||
const val KOTLIN_ANDROID = "1.8.10" | ||
const val KOTLIN_JVM = "1.8.10" | ||
const val ANDROID_LIBRARY = "8.1.2" | ||
const val KTLINT = "12.1.1" | ||
const val HILT = "2.44" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,16 @@ | ||
|
||
|
||
plugins { | ||
id("java-library") | ||
id("org.jetbrains.kotlin.jvm") | ||
id(Plugin.KOTLIN_JVM) | ||
id(Plugin.KTLINT) | ||
} | ||
|
||
java { | ||
sourceCompatibility = JavaVersion.VERSION_1_7 | ||
targetCompatibility = JavaVersion.VERSION_1_7 | ||
} | ||
sourceCompatibility = JavaVersion.VERSION_17 | ||
targetCompatibility = JavaVersion.VERSION_17 | ||
} | ||
|
||
dependencies { | ||
implementation(Dependency.JAVAX_INJECT) | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Q; 8에서 17로 변경할 때 어떤 이점이 있을까요?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
명확한 이점을 찾아 올린 것은 아닙니다.
compileDebugJavaWithJavac와 kaptGenerateStubsDebugKotlin 빌드에러를 해결하기 위해 수정했습니다.
에러내용:
Caused by: org.gradle.api.GradleException: 'compileDebugJavaWithJavac' task (current target is 1.8) and 'kaptGenerateStubsDebugKotlin' task (current target is 17) jvm target compatibility should be set to the same Java version.