From c8db4478eaebe8c5112549ace960eeb6431e9d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=84=9D?= Date: Tue, 7 Feb 2023 15:42:26 +0900 Subject: [PATCH] =?UTF-8?q?Issues=20#287=20chore:=20data=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=EC=9D=84=20=ED=95=9C=20=EA=B3=B3=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 1 + {data-local => data/data-database}/.gitignore | 0 data/data-database/build.gradle.kts | 34 +++++++++++++++++++ {data-remote => data/data-remote}/.gitignore | 0 .../data-remote}/build.gradle.kts | 0 .../data/remote/api/KakaoApiService.kt | 0 .../lighthouse/data/remote/di/ApiModule.kt | 0 .../lighthouse/data/remote/di/DataModule.kt | 0 .../data/remote/di/NetworkModule.kt | 0 .../BrandPlaceInfoDataContainerMapper.kt | 0 .../model/BrandPlaceInfoDataContainer.kt | 0 .../repository/BrandRemoteRepositoryImpl.kt | 0 .../remote/utils/HTTPRequestInterceptor.kt | 0 data/{ => data}/.gitignore | 0 data/{ => data}/build.gradle.kts | 0 data/{ => data}/consumer-rules.pro | 0 data/{ => data}/proguard-rules.pro | 0 data/{ => data}/src/main/AndroidManifest.xml | 0 .../com/lighthouse/database/BeepDatabase.kt | 0 .../database/converter/DateConverter.kt | 0 .../database/converter/DmsConverter.kt | 0 .../database/converter/RectConverter.kt | 0 .../database/converter/UriConverter.kt | 0 .../database/dao/BrandWithSectionDao.kt | 0 .../lighthouse/database/dao/GifticonDao.kt | 0 .../database/entity/BrandLocationEntity.kt | 0 .../database/entity/BrandWithSections.kt | 0 .../database/entity/GifticonCropEntity.kt | 0 .../database/entity/GifticonEntity.kt | 0 .../database/entity/GifticonWithCrop.kt | 0 .../database/entity/SectionEntity.kt | 0 .../database/entity/UsageHistoryEntity.kt | 0 .../mapper/GifticonCropEntityMapper.kt | 0 .../mapper/GifticonForAddtionMapper.kt | 0 .../mapper/GifticonForUpdateMapper.kt | 0 .../database/mapper/GifticonWithCropMapper.kt | 0 .../database/mapper/UsageHistoryMapper.kt | 0 .../datasource/auth/AuthDataSource.kt | 0 .../datasource/auth/AuthDataSourceImpl.kt | 0 .../datasource/brand/BrandLocalDataSource.kt | 0 .../brand/BrandLocalDataSourceImpl.kt | 0 .../gallery/GalleryImageLocalSource.kt | 0 .../gallery/GalleryImageLocalSourceImpl.kt | 0 .../gallery/GalleryImagePagingSource.kt | 0 .../gifticon/GifticonImageRecognizeSource.kt | 0 .../gifticon/GifticonImageSource.kt | 0 .../gifticon/GifticonLocalDataSource.kt | 0 .../gifticon/GifticonLocalDataSourceImpl.kt | 0 .../lighthouse/mapper/BrandEntityMapper.kt | 0 .../lighthouse/mapper/GifticonCropMapper.kt | 0 .../lighthouse/mapper/GifticonEntityMapper.kt | 0 .../mapper/GifticonRecognizeInfoMapper.kt | 0 .../java/com/lighthouse/mapper/RectMapper.kt | 0 .../com/lighthouse/mapper/RectangleMapper.kt | 0 .../lighthouse/model/GifticonImageResult.kt | 0 .../repository/AuthRepositoryImpl.kt | 0 .../repository/BrandRepositoryImpl.kt | 0 .../repository/GalleryImageRepositoryImpl.kt | 0 .../GifticonImageRecognizeRepositoryImpl.kt | 0 .../repository/GifticonRepositoryImpl.kt | 0 .../repository/LocationRepositoryImpl.kt | 0 .../repository/SecurityRepositoryImpl.kt | 0 .../UserPreferencesRepositoryImpl.kt | 0 .../repository/brand/BrandRemoteRepository.kt | 0 .../datasource/BrandLocalDataSourceTest.kt | 0 settings.gradle.kts | 5 +-- 66 files changed, 38 insertions(+), 2 deletions(-) rename {data-local => data/data-database}/.gitignore (100%) create mode 100644 data/data-database/build.gradle.kts rename {data-remote => data/data-remote}/.gitignore (100%) rename {data-remote => data/data-remote}/build.gradle.kts (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/api/KakaoApiService.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/di/ApiModule.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/di/DataModule.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/di/NetworkModule.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/mapper/BrandPlaceInfoDataContainerMapper.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/model/BrandPlaceInfoDataContainer.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/repository/BrandRemoteRepositoryImpl.kt (100%) rename {data-remote => data/data-remote}/src/main/java/com/lighthouse/data/remote/utils/HTTPRequestInterceptor.kt (100%) rename data/{ => data}/.gitignore (100%) rename data/{ => data}/build.gradle.kts (100%) rename data/{ => data}/consumer-rules.pro (100%) rename data/{ => data}/proguard-rules.pro (100%) rename data/{ => data}/src/main/AndroidManifest.xml (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/BeepDatabase.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/converter/DateConverter.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/converter/DmsConverter.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/converter/RectConverter.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/converter/UriConverter.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/dao/BrandWithSectionDao.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/dao/GifticonDao.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/BrandLocationEntity.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/BrandWithSections.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/GifticonCropEntity.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/GifticonEntity.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/GifticonWithCrop.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/SectionEntity.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/entity/UsageHistoryEntity.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/mapper/GifticonCropEntityMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/mapper/GifticonForAddtionMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/mapper/GifticonForUpdateMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/mapper/GifticonWithCropMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/database/mapper/UsageHistoryMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/auth/AuthDataSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/auth/AuthDataSourceImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSourceImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageRecognizeSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/BrandEntityMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/GifticonCropMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/GifticonEntityMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/GifticonRecognizeInfoMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/RectMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/mapper/RectangleMapper.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/model/GifticonImageResult.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/AuthRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/BrandRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/GalleryImageRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/GifticonImageRecognizeRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/GifticonRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/LocationRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/SecurityRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/UserPreferencesRepositoryImpl.kt (100%) rename data/{ => data}/src/main/java/com/lighthouse/repository/brand/BrandRemoteRepository.kt (100%) rename data/{ => data}/src/test/java/data/datasource/BrandLocalDataSourceTest.kt (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index eb5352e65..be3600c67 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -40,6 +40,7 @@ dependencies { implementation(projects.domain) implementation(projects.presentation) implementation(projects.data) + implementation(projects.dataDatabase) implementation(projects.dataRemote) implementation(libs.androidX.hilt.work) diff --git a/data-local/.gitignore b/data/data-database/.gitignore similarity index 100% rename from data-local/.gitignore rename to data/data-database/.gitignore diff --git a/data/data-database/build.gradle.kts b/data/data-database/build.gradle.kts new file mode 100644 index 000000000..db3c6ccc7 --- /dev/null +++ b/data/data-database/build.gradle.kts @@ -0,0 +1,34 @@ +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id("beep.android.library") + alias(libs.plugins.ksp) +} + +android { + namespace = "com.lighthouse.data.database" +} + +dependencies { + implementation(projects.core) + implementation(projects.coreAndroid) + 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) + + ksp(libs.androidX.room.compiler) +} diff --git a/data-remote/.gitignore b/data/data-remote/.gitignore similarity index 100% rename from data-remote/.gitignore rename to data/data-remote/.gitignore diff --git a/data-remote/build.gradle.kts b/data/data-remote/build.gradle.kts similarity index 100% rename from data-remote/build.gradle.kts rename to data/data-remote/build.gradle.kts diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/api/KakaoApiService.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/api/KakaoApiService.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/api/KakaoApiService.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/api/KakaoApiService.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/di/ApiModule.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/di/ApiModule.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/di/ApiModule.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/di/ApiModule.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/di/DataModule.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/di/DataModule.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/di/DataModule.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/di/DataModule.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/di/NetworkModule.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/di/NetworkModule.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/di/NetworkModule.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/di/NetworkModule.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/mapper/BrandPlaceInfoDataContainerMapper.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/mapper/BrandPlaceInfoDataContainerMapper.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/mapper/BrandPlaceInfoDataContainerMapper.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/mapper/BrandPlaceInfoDataContainerMapper.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/model/BrandPlaceInfoDataContainer.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/model/BrandPlaceInfoDataContainer.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/model/BrandPlaceInfoDataContainer.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/model/BrandPlaceInfoDataContainer.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/repository/BrandRemoteRepositoryImpl.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/repository/BrandRemoteRepositoryImpl.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/repository/BrandRemoteRepositoryImpl.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/repository/BrandRemoteRepositoryImpl.kt diff --git a/data-remote/src/main/java/com/lighthouse/data/remote/utils/HTTPRequestInterceptor.kt b/data/data-remote/src/main/java/com/lighthouse/data/remote/utils/HTTPRequestInterceptor.kt similarity index 100% rename from data-remote/src/main/java/com/lighthouse/data/remote/utils/HTTPRequestInterceptor.kt rename to data/data-remote/src/main/java/com/lighthouse/data/remote/utils/HTTPRequestInterceptor.kt diff --git a/data/.gitignore b/data/data/.gitignore similarity index 100% rename from data/.gitignore rename to data/data/.gitignore diff --git a/data/build.gradle.kts b/data/data/build.gradle.kts similarity index 100% rename from data/build.gradle.kts rename to data/data/build.gradle.kts diff --git a/data/consumer-rules.pro b/data/data/consumer-rules.pro similarity index 100% rename from data/consumer-rules.pro rename to data/data/consumer-rules.pro diff --git a/data/proguard-rules.pro b/data/data/proguard-rules.pro similarity index 100% rename from data/proguard-rules.pro rename to data/data/proguard-rules.pro diff --git a/data/src/main/AndroidManifest.xml b/data/data/src/main/AndroidManifest.xml similarity index 100% rename from data/src/main/AndroidManifest.xml rename to data/data/src/main/AndroidManifest.xml diff --git a/data/src/main/java/com/lighthouse/database/BeepDatabase.kt b/data/data/src/main/java/com/lighthouse/database/BeepDatabase.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/BeepDatabase.kt rename to data/data/src/main/java/com/lighthouse/database/BeepDatabase.kt diff --git a/data/src/main/java/com/lighthouse/database/converter/DateConverter.kt b/data/data/src/main/java/com/lighthouse/database/converter/DateConverter.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/converter/DateConverter.kt rename to data/data/src/main/java/com/lighthouse/database/converter/DateConverter.kt diff --git a/data/src/main/java/com/lighthouse/database/converter/DmsConverter.kt b/data/data/src/main/java/com/lighthouse/database/converter/DmsConverter.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/converter/DmsConverter.kt rename to data/data/src/main/java/com/lighthouse/database/converter/DmsConverter.kt diff --git a/data/src/main/java/com/lighthouse/database/converter/RectConverter.kt b/data/data/src/main/java/com/lighthouse/database/converter/RectConverter.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/converter/RectConverter.kt rename to data/data/src/main/java/com/lighthouse/database/converter/RectConverter.kt diff --git a/data/src/main/java/com/lighthouse/database/converter/UriConverter.kt b/data/data/src/main/java/com/lighthouse/database/converter/UriConverter.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/converter/UriConverter.kt rename to data/data/src/main/java/com/lighthouse/database/converter/UriConverter.kt diff --git a/data/src/main/java/com/lighthouse/database/dao/BrandWithSectionDao.kt b/data/data/src/main/java/com/lighthouse/database/dao/BrandWithSectionDao.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/dao/BrandWithSectionDao.kt rename to data/data/src/main/java/com/lighthouse/database/dao/BrandWithSectionDao.kt diff --git a/data/src/main/java/com/lighthouse/database/dao/GifticonDao.kt b/data/data/src/main/java/com/lighthouse/database/dao/GifticonDao.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/dao/GifticonDao.kt rename to data/data/src/main/java/com/lighthouse/database/dao/GifticonDao.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/BrandLocationEntity.kt b/data/data/src/main/java/com/lighthouse/database/entity/BrandLocationEntity.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/BrandLocationEntity.kt rename to data/data/src/main/java/com/lighthouse/database/entity/BrandLocationEntity.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/BrandWithSections.kt b/data/data/src/main/java/com/lighthouse/database/entity/BrandWithSections.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/BrandWithSections.kt rename to data/data/src/main/java/com/lighthouse/database/entity/BrandWithSections.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/GifticonCropEntity.kt b/data/data/src/main/java/com/lighthouse/database/entity/GifticonCropEntity.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/GifticonCropEntity.kt rename to data/data/src/main/java/com/lighthouse/database/entity/GifticonCropEntity.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/GifticonEntity.kt b/data/data/src/main/java/com/lighthouse/database/entity/GifticonEntity.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/GifticonEntity.kt rename to data/data/src/main/java/com/lighthouse/database/entity/GifticonEntity.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/GifticonWithCrop.kt b/data/data/src/main/java/com/lighthouse/database/entity/GifticonWithCrop.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/GifticonWithCrop.kt rename to data/data/src/main/java/com/lighthouse/database/entity/GifticonWithCrop.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/SectionEntity.kt b/data/data/src/main/java/com/lighthouse/database/entity/SectionEntity.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/SectionEntity.kt rename to data/data/src/main/java/com/lighthouse/database/entity/SectionEntity.kt diff --git a/data/src/main/java/com/lighthouse/database/entity/UsageHistoryEntity.kt b/data/data/src/main/java/com/lighthouse/database/entity/UsageHistoryEntity.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/entity/UsageHistoryEntity.kt rename to data/data/src/main/java/com/lighthouse/database/entity/UsageHistoryEntity.kt diff --git a/data/src/main/java/com/lighthouse/database/mapper/GifticonCropEntityMapper.kt b/data/data/src/main/java/com/lighthouse/database/mapper/GifticonCropEntityMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/mapper/GifticonCropEntityMapper.kt rename to data/data/src/main/java/com/lighthouse/database/mapper/GifticonCropEntityMapper.kt diff --git a/data/src/main/java/com/lighthouse/database/mapper/GifticonForAddtionMapper.kt b/data/data/src/main/java/com/lighthouse/database/mapper/GifticonForAddtionMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/mapper/GifticonForAddtionMapper.kt rename to data/data/src/main/java/com/lighthouse/database/mapper/GifticonForAddtionMapper.kt diff --git a/data/src/main/java/com/lighthouse/database/mapper/GifticonForUpdateMapper.kt b/data/data/src/main/java/com/lighthouse/database/mapper/GifticonForUpdateMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/mapper/GifticonForUpdateMapper.kt rename to data/data/src/main/java/com/lighthouse/database/mapper/GifticonForUpdateMapper.kt diff --git a/data/src/main/java/com/lighthouse/database/mapper/GifticonWithCropMapper.kt b/data/data/src/main/java/com/lighthouse/database/mapper/GifticonWithCropMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/mapper/GifticonWithCropMapper.kt rename to data/data/src/main/java/com/lighthouse/database/mapper/GifticonWithCropMapper.kt diff --git a/data/src/main/java/com/lighthouse/database/mapper/UsageHistoryMapper.kt b/data/data/src/main/java/com/lighthouse/database/mapper/UsageHistoryMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/database/mapper/UsageHistoryMapper.kt rename to data/data/src/main/java/com/lighthouse/database/mapper/UsageHistoryMapper.kt diff --git a/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSource.kt b/data/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/auth/AuthDataSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSourceImpl.kt b/data/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSourceImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/auth/AuthDataSourceImpl.kt rename to data/data/src/main/java/com/lighthouse/datasource/auth/AuthDataSourceImpl.kt diff --git a/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSource.kt b/data/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSourceImpl.kt b/data/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSourceImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSourceImpl.kt rename to data/data/src/main/java/com/lighthouse/datasource/brand/BrandLocalDataSourceImpl.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt b/data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt rename to data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImageLocalSourceImpl.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/gallery/GalleryImagePagingSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageRecognizeSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageRecognizeSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageRecognizeSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageRecognizeSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonImageSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt b/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt rename to data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSource.kt diff --git a/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt b/data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt rename to data/data/src/main/java/com/lighthouse/datasource/gifticon/GifticonLocalDataSourceImpl.kt diff --git a/data/src/main/java/com/lighthouse/mapper/BrandEntityMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/BrandEntityMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/BrandEntityMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/BrandEntityMapper.kt diff --git a/data/src/main/java/com/lighthouse/mapper/GifticonCropMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/GifticonCropMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/GifticonCropMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/GifticonCropMapper.kt diff --git a/data/src/main/java/com/lighthouse/mapper/GifticonEntityMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/GifticonEntityMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/GifticonEntityMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/GifticonEntityMapper.kt diff --git a/data/src/main/java/com/lighthouse/mapper/GifticonRecognizeInfoMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/GifticonRecognizeInfoMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/GifticonRecognizeInfoMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/GifticonRecognizeInfoMapper.kt diff --git a/data/src/main/java/com/lighthouse/mapper/RectMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/RectMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/RectMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/RectMapper.kt diff --git a/data/src/main/java/com/lighthouse/mapper/RectangleMapper.kt b/data/data/src/main/java/com/lighthouse/mapper/RectangleMapper.kt similarity index 100% rename from data/src/main/java/com/lighthouse/mapper/RectangleMapper.kt rename to data/data/src/main/java/com/lighthouse/mapper/RectangleMapper.kt diff --git a/data/src/main/java/com/lighthouse/model/GifticonImageResult.kt b/data/data/src/main/java/com/lighthouse/model/GifticonImageResult.kt similarity index 100% rename from data/src/main/java/com/lighthouse/model/GifticonImageResult.kt rename to data/data/src/main/java/com/lighthouse/model/GifticonImageResult.kt diff --git a/data/src/main/java/com/lighthouse/repository/AuthRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/AuthRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/AuthRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/AuthRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/BrandRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/BrandRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/BrandRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/BrandRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/GalleryImageRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/GalleryImageRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/GalleryImageRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/GalleryImageRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/GifticonImageRecognizeRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/GifticonImageRecognizeRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/GifticonImageRecognizeRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/GifticonImageRecognizeRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/GifticonRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/GifticonRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/GifticonRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/GifticonRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/LocationRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/LocationRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/LocationRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/LocationRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/SecurityRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/SecurityRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/SecurityRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/SecurityRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/UserPreferencesRepositoryImpl.kt b/data/data/src/main/java/com/lighthouse/repository/UserPreferencesRepositoryImpl.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/UserPreferencesRepositoryImpl.kt rename to data/data/src/main/java/com/lighthouse/repository/UserPreferencesRepositoryImpl.kt diff --git a/data/src/main/java/com/lighthouse/repository/brand/BrandRemoteRepository.kt b/data/data/src/main/java/com/lighthouse/repository/brand/BrandRemoteRepository.kt similarity index 100% rename from data/src/main/java/com/lighthouse/repository/brand/BrandRemoteRepository.kt rename to data/data/src/main/java/com/lighthouse/repository/brand/BrandRemoteRepository.kt diff --git a/data/src/test/java/data/datasource/BrandLocalDataSourceTest.kt b/data/data/src/test/java/data/datasource/BrandLocalDataSourceTest.kt similarity index 100% rename from data/src/test/java/data/datasource/BrandLocalDataSourceTest.kt rename to data/data/src/test/java/data/datasource/BrandLocalDataSourceTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index b004316c2..95995e839 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -36,7 +36,8 @@ includeProject(":common", "commons") includeProject(":common-android", "commons") includeProject(":common-location", "commons") includeProject(":common-recognizer", "commons") -includeProject(":data") -includeProject(":data-remote") +includeProject(":data", "data") +includeProject(":data-database", "data") +includeProject(":data-remote", "data") includeProject(":presentation") includeProject(":domain")