Merge remote-tracking branch 'upstream/main'

FoKE-Developers · Sep 23, 2024 · 9517cc5 · 9517cc5
2 parents a67a21e + ebd2c30
commit 9517cc5
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # 같이네컷
-- Last updated: 2024-08-13
+- Last updated: 2024-09-22
 
 ## Specification
 
@@ -33,16 +33,12 @@
    - Labels: 해당하는 라벨 추가 **반드시 하나의 라벨만 추가할 것**
    - Projects: 기입 X
    - Milestone: 기입 X
+- Rebase로 merge **Squash 금지!!**
 
 ## Code Review Rules
 - PR 요청 후, slack에 리뷰 요청
 - 리뷰에 대한 comment는 반드시 해당 PR에 comment로 남기고 다른 채널에서는 진행하지 않는다
 
 ## Dependencies
 - 프로젝트 및 관련 버전은 libs.versions.toml 에서 관리
-- 기타 의존성은 사용한 모듈에서 관리
-
-## TODO
-- 기본적인 모듈 + Manifest 설정 추가 후 커밋
-- 모듈간 의존성 추가 커밋
-- 샘플코드 + Hilt 추가 후 커밋
+- 기타 의존성은 사용한 모듈에서 관리
diff --git a/app/src/main/java/com/foke/together/MainApplication.kt b/app/src/main/java/com/foke/together/MainApplication.kt
@@ -2,7 +2,9 @@ package com.foke.together
 
 import android.app.Application
 import com.foke.together.util.AppLog
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class MainApplication: Application() {
     override fun onCreate() {
         super.onCreate()

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,9 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
     alias(libs.plugins.android.library) apply false
+
+    alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.kotlin.kapt) apply false
 }
 
 subprojects {
@@ -46,15 +49,20 @@ subprojects {
                 getByName("debug") {
                     isMinifyEnabled = false
                     isShrinkResources = false
-                    // TODO: signing
+                    signingConfig = signingConfigs.getByName("debug")
+
                 }
                 getByName("release") {
-                    isMinifyEnabled = true
-                    isShrinkResources = true
+                    // TODO: need to resolve for Hilt R8 error and change to `true`
+                    isMinifyEnabled = false
+                    isShrinkResources = false
+
                     proguardFiles(
                         getDefaultProguardFile("proguard-android-optimize.txt"),
                         "proguard-rules.pro"
                     )
+                    // TODO: change to release keystore
+                    signingConfig = signingConfigs.getByName("debug")
                 }
             }
         }
@@ -74,8 +82,29 @@ subprojects {
                         getDefaultProguardFile("proguard-android-optimize.txt"),
                         "proguard-rules.pro"
                     )
+                    // TODO: change to release keystore
+                    signingConfig = signingConfigs.getByName("debug")
                 }
             }
         }
     }
+
+    plugins.withId("org.jetbrains.kotlin.android") {
+        apply(plugin = "kotlin-kapt")
+        apply(plugin = "dagger.hilt.android.plugin")
+
+        dependencies {
+            add("implementation", libs.hilt)
+            add("kapt", libs.hilt.compiler)
+        }
+
+        configure<org.jetbrains.kotlin.gradle.plugin.KaptExtension> {
+            correctErrorTypes = true
+        }
+    }
+
+    configurations.all {
+        // resolve error of import duplicated "annotations" with "org.jetbrains.annotations
+        exclude(group = "com.intellij", module = "annotations")
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,6 +16,9 @@ agp = "8.5.2"
 kotlin = "1.9.20"
 coreKtx = "1.13.1"
 
+# kapt -----------
+kotlin-kapt = "1.9.20"
+
 # android --------
 appcompat = "1.7.0"
 composeCompiler = "1.5.5"
@@ -24,6 +27,11 @@ activityCompose = "1.9.2"
 composeBom = "2024.09.02"
 material = "1.12.0"
 
+# hilt -----------
+hilt = "2.49"
+androidx-hilt-compiler = "1.2.0"
+androidx-hilt-navigation-compose = "1.2.0"
+
 # test -----------
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -33,11 +41,10 @@ navigationCompose = "2.7.6"
 
 
 [libraries]
+# core -----------
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+
+# android --------
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
@@ -51,10 +58,25 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 
+# test -----------
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+
+# hilt -----------
+hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
+hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
+androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "androidx-hilt-compiler" }
+androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidx-hilt-navigation-compose" }
+
 
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin-kapt"}
 
+# hilt -----------
+hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt"}
diff --git a/presenter/build.gradle.kts b/presenter/build.gradle.kts
@@ -30,6 +30,8 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.navigation.compose)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

diff --git a/presenter/src/main/java/com/foke/together/presenter/MainActivity.kt b/presenter/src/main/java/com/foke/together/presenter/MainActivity.kt
@@ -14,7 +14,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.compose.rememberNavController
 import com.foke.together.presenter.navigation.NavGraph
 import com.foke.together.presenter.ui.theme.FourCutTogetherTheme
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)