Weekly/9: Develop 브랜치의 9주차 개발 내용을 Master 브랜치에 병합

kakao-tech-campus-2nd-step3 · Nov 1, 2024 · 54b0e22 · 54b0e22
2 parents 0f851fb + 6ab8fe2
commit 54b0e22
Show file tree

Hide file tree

Showing 83 changed files with 1,781 additions and 501 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,10 +22,6 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY"))
-        buildConfigField("String", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
-        resValue("string", "KAKAO_API_KEY_MANIFEST", getApiKey("KAKAO_API_KEY_MANIFEST"))
     }
 
     buildTypes {
@@ -48,7 +44,6 @@ android {
     buildFeatures {
         dataBinding = true
         viewBinding = true
-        buildConfig = true
     }
 }
 
@@ -88,4 +83,6 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.dagger:hilt-android:2.48.1")
     kapt("com.google.dagger:hilt-compiler:2.48.1")
+
+    implementation(project(":build-config"))
 }
diff --git a/app/src/main/java/com/kappzzang/jeongsan/JeongsanApplication.kt b/app/src/main/java/com/kappzzang/jeongsan/JeongsanApplication.kt
@@ -3,6 +3,7 @@ package com.kappzzang.jeongsan
 import android.app.Application
 import android.util.Log
 import com.kakao.sdk.common.KakaoSdk
+import com.kappzzang.jeongsan.build_config.BuildConfig
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp

diff --git a/app/src/main/java/com/kappzzang/jeongsan/di/DispatcherModule.kt b/app/src/main/java/com/kappzzang/jeongsan/di/DispatcherModule.kt
@@ -0,0 +1,16 @@
+package com.kappzzang.jeongsan.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DispatcherModule {
+
+    @Provides
+    fun provideIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+}
diff --git a/build-config/.gitignore b/build-config/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/build-config/build.gradle.kts b/build-config/build.gradle.kts
@@ -0,0 +1,43 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("org.jlleitschuh.gradle.ktlint")
+}
+
+fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)
+
+android {
+    compileSdk = 34
+    namespace = "com.kappzzang.jeongsan.build_config"
+
+    buildTypes {
+        debug {
+            buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY"))
+            buildConfigField("String", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
+            buildConfigField("String", "KEYSTORE_NAME", getApiKey("KEYSTORE_NAME"))
+            resValue("string", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
+            resValue("string", "KAKAO_API_KEY_MANIFEST", getApiKey("KAKAO_API_KEY_MANIFEST"))
+
+            buildConfigField("String", "KAKAO_API_URL", getApiKey("KAKAO_API_URL"))
+            buildConfigField("String", "SERVICE_URL", getApiKey("SERVICE_URL"))
+            buildConfigField("String", "KAKAO_AUTH_URL", getApiKey("KAKAO_AUTH_URL"))
+        }
+
+        release {
+            buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY"))
+            buildConfigField("String", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
+            buildConfigField("String", "KEYSTORE_NAME", getApiKey("KEYSTORE_NAME"))
+            resValue("string", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
+            resValue("string", "KAKAO_API_KEY_MANIFEST", getApiKey("KAKAO_API_KEY_MANIFEST"))
+
+            buildConfigField("String", "KAKAO_API_URL", getApiKey("KAKAO_API_URL"))
+            buildConfigField("String", "SERVICE_URL", getApiKey("SERVICE_URL"))
+            buildConfigField("String", "KAKAO_AUTH_URL", getApiKey("KAKAO_AUTH_URL"))
+        }
+    }
+    buildFeatures {
+        buildConfig = true
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,4 +23,8 @@ allprojects {
     }
 
     group = "com.kappzzang.jeongsan"
+
+    afterEvaluate {
+        project.apply("$rootDir/gradle/common.gradle")
+    }
 }
diff --git a/common/datastore/build.gradle.kts b/common/datastore/build.gradle.kts
@@ -8,40 +8,13 @@ plugins {
 
 android {
     namespace = "com.kappzzang.datastore"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 26
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {
-
     implementation("androidx.datastore:datastore-preferences:1.1.1")
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 }
diff --git a/common/navigation/build.gradle.kts b/common/navigation/build.gradle.kts
@@ -5,30 +5,11 @@ plugins {
 
 android {
     namespace = "com.kappzzang.jeongsan.navigation"
-    compileSdk = 34
 
     defaultConfig {
         minSdk = 26
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
     }
 }
 
@@ -37,7 +18,4 @@ dependencies {
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
 }
diff --git a/common/resource/build.gradle.kts b/common/resource/build.gradle.kts
@@ -6,21 +6,6 @@ plugins {
 
 android {
     namespace = "com.kappzzang.jeongsan"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 26
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 dependencies {

diff --git a/common/resource/src/main/res/values/dimen.xml b/common/resource/src/main/res/values/dimen.xml
@@ -63,4 +63,4 @@
     <!-- 송금 요청 금액 확인 페이지 -->
     <dimen name="send_message_line_height"> 3dp </dimen>
     <dimen name="send_message_menu_text_size"> 20sp </dimen>
-</resources>
+</resources>
diff --git a/common/retrofit/build.gradle.kts b/common/retrofit/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -8,33 +6,8 @@ plugins {
     id("com.google.dagger.hilt.android")
 }
 
-fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)
-
 android {
     namespace = "com.kappzzang.jeongsan"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 26
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField("String", "KAKAO_API_URL", getApiKey("KAKAO_API_URL"))
-        buildConfigField("String", "SERVICE_URL", getApiKey("SERVICE_URL"))
-        buildConfigField("String", "KAKAO_AUTH_URL", getApiKey("KAKAO_AUTH_URL"))
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    buildFeatures {
-        buildConfig = true
-    }
 }
 
 dependencies {
@@ -44,4 +17,5 @@ dependencies {
 
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
+    implementation(project(":build-config"))
 }
diff --git a/common/retrofit/src/main/java/com/kappzzang/jeongsan/retrofit/RetrofitModule.kt b/common/retrofit/src/main/java/com/kappzzang/jeongsan/retrofit/RetrofitModule.kt
@@ -1,6 +1,6 @@
 package com.kappzzang.jeongsan.retrofit
 
-import com.kappzzang.jeongsan.BuildConfig
+import com.kappzzang.jeongsan.build_config.BuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -10,25 +8,9 @@ plugins {
 
 android {
     namespace = "com.kappzzang.jeongsan"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 26
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 subprojects {
-    fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)
     apply {
         plugin("com.android.library")
         plugin("org.jetbrains.kotlin.android")
@@ -47,6 +29,7 @@ subprojects {
         implementation(project(":common:util"))
         implementation(project(":domain"))
         implementation(project(":domain:group"))
+        implementation(project(":build-config"))
 
         // Test Dependencies
         testImplementation("org.assertj:assertj-core:3.25.3")
@@ -58,30 +41,6 @@ subprojects {
         testImplementation("androidx.arch.core:core-testing:2.2.0")
         testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
         kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.48.1")
-    }
-
-    android {
-        compileSdk = 34
-
-        defaultConfig {
-            minSdk = 26
-
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-            buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY"))
-            buildConfigField("String", "KAKAO_API_KEY", getApiKey("KAKAO_API_KEY"))
-            buildConfigField("String", "KEYSTORE_NAME", getApiKey("KEYSTORE_NAME"))
-        }
-
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-        buildFeatures {
-            buildConfig = true
-        }
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
     }
 }
diff --git a/data/expense/build.gradle.kts b/data/expense/build.gradle.kts
@@ -1,9 +1,14 @@
+plugins {
+    kotlin("plugin.serialization") version "1.9.0"
+}
+
 android {
     namespace = "com.kappzzang.jeongsan.expense"
 }
 dependencies {
     implementation(project(":domain:expense"))
     implementation("androidx.room:room-ktx:2.6.1")
     implementation("com.kakao.sdk:v2-talk:2.20.6")
+    implementation(project(":domain:common-user"))
     testImplementation("androidx.room:room-testing:2.6.1")
 }