Issues #287 feat: 프로젝트 정리 및 추가

boostcampwm-2022 · Feb 9, 2023 · 172ea49 · 172ea49
1 parent 1ed75a5
commit 172ea49
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 75 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,18 +34,19 @@ dependencies {
     implementation(projects.core)
     implementation(projects.coreAndroid)
     implementation(projects.model)
+    implementation(projects.auth)
     implementation(projects.common)
-    implementation(projects.commonAuth)
     implementation(projects.commonAndroid)
-    implementation(projects.commonLocation)
-    implementation(projects.commonRecognizer)
+    implementation(projects.utilsLocation)
+    implementation(projects.utilsRecognizer)
     implementation(projects.domain)
     implementation(projects.presentation)
     implementation(projects.data)
     implementation(projects.dataContent)
     implementation(projects.dataDatabase)
     implementation(projects.dataPreference)
     implementation(projects.dataRemote)
+    implementation(projects.dataStorage)
 
     implementation(libs.androidX.hilt.work)
     implementation(libs.androidX.work.runtime.ktx)

diff --git a/auth/.gitignore b/auth/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("beep.android.library")
+    id("beep.android.hilt")
+}
+
+android {
+    namespace = "com.lighthouse.auth"
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.coreAndroid)
+    implementation(projects.model)
+
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.auth.ktx)
+}
diff --git a/commons/common-auth/.gitignore b/commons/common-auth/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/data/data-preference/build.gradle.kts b/data/data-preference/build.gradle.kts
@@ -15,8 +15,6 @@ dependencies {
     implementation(projects.model)
     implementation(projects.common)
     implementation(projects.commonAndroid)
-    implementation(projects.commonLocation)
-    implementation(projects.commonRecognizer)
     implementation(projects.data)
 
     implementation(libs.androidX.datastore.preferences)

diff --git a/data/data-storage/.gitignore b/data/data-storage/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/data/data-storage/build.gradle.kts b/data/data-storage/build.gradle.kts
@@ -0,0 +1,21 @@
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("beep.android.library")
+    id("beep.android.hilt")
+    alias(libs.plugins.ksp)
+}
+
+android {
+    namespace = "com.lighthouse.data.storage"
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.coreAndroid)
+    implementation(projects.model)
+    implementation(projects.common)
+    implementation(projects.commonAndroid)
+    implementation(projects.data)
+
+    implementation(libs.timber)
+}
diff --git a/data/data/build.gradle.kts b/data/data/build.gradle.kts
@@ -1,6 +1,7 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("beep.android.library")
+    id("beep.android.hilt")
     alias(libs.plugins.ksp)
 }
 
@@ -14,8 +15,6 @@ dependencies {
     implementation(projects.model)
     implementation(projects.common)
     implementation(projects.commonAndroid)
-    implementation(projects.commonLocation)
-    implementation(projects.commonRecognizer)
     implementation(projects.domain)
 
 //    implementation(libs.androidX.room.runtime)

diff --git a/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,15 +32,17 @@ includeProject(":app")
 includeProject(":core")
 includeProject(":core-android")
 includeProject(":model")
+includeProject(":auth")
 includeProject(":common", "commons")
 includeProject(":common-auth", "commons")
 includeProject(":common-android", "commons")
-includeProject(":common-location", "commons")
-includeProject(":common-recognizer", "commons")
+includeProject(":utils-location", "utils")
+includeProject(":utils-recognizer", "utils")
 includeProject(":data", "data")
 includeProject(":data-database", "data")
 includeProject(":data-remote", "data")
 includeProject(":data-content", "data")
 includeProject(":data-preference", "data")
+includeProject(":data-storage", "data")
 includeProject(":presentation")
 includeProject(":domain")
diff --git a/utils/utils-location/.gitignore b/utils/utils-location/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/utils/utils-location/build.gradle.kts b/utils/utils-location/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    id("beep.android.library")
+    id("beep.android.hilt")
+}
+
+android {
+    namespace = "com.lighthouse.beep.utils.location"
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.coreAndroid)
+    implementation(projects.model)
+
+    implementation(libs.gms.play.services.location)
+
+//    implementation(libs.androidX.activity.ktx)
+//    implementation(libs.androidX.appcompat)
+//    implementation(libs.androidX.core.ktx)
+//    implementation(libs.androidX.fragment.ktx)
+//    implementation(libs.zxing.core)
+}
diff --git a/utils/utils-recognizer/.gitignore b/utils/utils-recognizer/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/utils/utils-recognizer/build.gradle.kts b/utils/utils-recognizer/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id("beep.android.library")
+    id("beep.android.hilt")
+}
+
+android {
+    namespace = "com.lighthouse.beep.utils.recognizer"
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.coreAndroid)
+    implementation(projects.model)
+
+    implementation(libs.mlkit.text.recognition.korean)
+}