From 21d57252b22983b1c017fcdb3ef9d4721af9854d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=84=9D?= Date: Thu, 9 Feb 2023 09:14:09 +0900 Subject: [PATCH] =?UTF-8?q?Issues=20#287=20feat:=20gradle=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 +++ commons/common-auth/build.gradle.kts | 17 +++++++++ commons/common-recognizer/build.gradle.kts | 1 - data/data-database/build.gradle.kts | 6 +--- data/data/build.gradle.kts | 41 ++++++++++++---------- domain/build.gradle.kts | 1 - settings.gradle.kts | 3 ++ 7 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 commons/common-auth/build.gradle.kts diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be3600c67..d4ad710cc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -35,12 +35,16 @@ dependencies { implementation(projects.coreAndroid) implementation(projects.model) implementation(projects.common) + implementation(projects.commonAuth) implementation(projects.commonAndroid) implementation(projects.commonLocation) + implementation(projects.commonRecognizer) implementation(projects.domain) implementation(projects.presentation) implementation(projects.data) + implementation(projects.dataContent) implementation(projects.dataDatabase) + implementation(projects.dataPreference) implementation(projects.dataRemote) implementation(libs.androidX.hilt.work) diff --git a/commons/common-auth/build.gradle.kts b/commons/common-auth/build.gradle.kts new file mode 100644 index 000000000..a39dadbd3 --- /dev/null +++ b/commons/common-auth/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("beep.android.library") + id("beep.android.hilt") +} + +android { + namespace = "com.lighthouse.beep.common.recognizer" +} + +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-recognizer/build.gradle.kts b/commons/common-recognizer/build.gradle.kts index 98ffa1429..a13c52c9d 100644 --- a/commons/common-recognizer/build.gradle.kts +++ b/commons/common-recognizer/build.gradle.kts @@ -12,6 +12,5 @@ dependencies { implementation(projects.coreAndroid) implementation(projects.model) - implementation(platform(libs.firebase.bom)) implementation(libs.mlkit.text.recognition.korean) } diff --git a/data/data-database/build.gradle.kts b/data/data-database/build.gradle.kts index db3c6ccc7..ffac243fd 100644 --- a/data/data-database/build.gradle.kts +++ b/data/data-database/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,19 +15,14 @@ dependencies { implementation(projects.model) implementation(projects.common) implementation(projects.commonAndroid) - implementation(projects.commonLocation) - implementation(projects.commonRecognizer) implementation(projects.data) implementation(libs.androidX.room.runtime) implementation(libs.androidX.room.ktx) - implementation(libs.androidX.hilt.work) implementation(libs.androidX.paging.runtime) - implementation(libs.androidX.work.runtime.ktx) implementation(libs.androidX.core.ktx) implementation(libs.kotlin.coroutine.core) - implementation(libs.kotlin.coroutine.android) implementation(libs.timber) diff --git a/data/data/build.gradle.kts b/data/data/build.gradle.kts index 46c4ea354..fcdc01254 100644 --- a/data/data/build.gradle.kts +++ b/data/data/build.gradle.kts @@ -18,30 +18,33 @@ dependencies { implementation(projects.commonRecognizer) implementation(projects.domain) - implementation(libs.androidX.room.runtime) - implementation(libs.androidX.room.ktx) - implementation(libs.androidX.hilt.work) - implementation(libs.androidX.paging.runtime) - implementation(libs.androidX.work.runtime.ktx) - implementation(libs.androidX.datastore.preferences) - implementation(libs.androidX.core.ktx) +// implementation(libs.androidX.room.runtime) +// implementation(libs.androidX.room.ktx) +// implementation(libs.androidX.hilt.work) +// implementation(libs.androidX.paging.runtime) +// implementation(libs.androidX.work.runtime.ktx) +// implementation(libs.androidX.datastore.preferences) +// implementation(libs.androidX.core.ktx) + + implementation(libs.androidX.paging.common.ktx) implementation(libs.kotlin.coroutine.core) - implementation(libs.kotlin.coroutine.android) - implementation(libs.squareup.retrofit2) - implementation(libs.squareup.retrofit2.converter.moshi) - implementation(libs.squareup.moshi.kotlin) - implementation(libs.squareup.moshi.adapters) + implementation(libs.javax.inject) - implementation(platform(libs.firebase.bom)) - implementation(libs.firebase.auth.ktx) - implementation(libs.firebase.firestore.ktx) - implementation(libs.firebase.storage.ktx) - implementation(libs.mlkit.text.recognition.korean) +// implementation(libs.squareup.retrofit2) +// implementation(libs.squareup.retrofit2.converter.moshi) +// implementation(libs.squareup.moshi.kotlin) +// implementation(libs.squareup.moshi.adapters) +// +// implementation(platform(libs.firebase.bom)) +// implementation(libs.firebase.auth.ktx) +// implementation(libs.firebase.firestore.ktx) +// implementation(libs.firebase.storage.ktx) +// implementation(libs.mlkit.text.recognition.korean) implementation(libs.timber) - ksp(libs.androidX.room.compiler) - ksp(libs.squareup.moshi.kotlin.codegen) +// ksp(libs.androidX.room.compiler) +// ksp(libs.squareup.moshi.kotlin.codegen) } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index bcaf335d4..6d5fb1860 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -9,6 +9,5 @@ dependencies { implementation(libs.kotlin.coroutine.core) implementation(libs.androidX.paging.common.ktx) - implementation(libs.androidX.room.common) implementation(libs.javax.inject) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 95995e839..966a35de8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,11 +33,14 @@ includeProject(":core") includeProject(":core-android") includeProject(":model") includeProject(":common", "commons") +includeProject(":common-auth", "commons") includeProject(":common-android", "commons") includeProject(":common-location", "commons") includeProject(":common-recognizer", "commons") includeProject(":data", "data") includeProject(":data-database", "data") includeProject(":data-remote", "data") +includeProject(":data-content", "data") +includeProject(":data-preference", "data") includeProject(":presentation") includeProject(":domain")