From fd0c28dbb79abf8dc56c89d0421cfd86cb8772de Mon Sep 17 00:00:00 2001 From: Ichinose Yoshihiro Date: Sun, 3 Nov 2024 17:04:00 +0900 Subject: [PATCH] =?UTF-8?q?refactor(signin):=20data.api=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=81data.impl=E3=82=92data=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/testing/build.gradle.kts | 2 +- feature/signin/data/{api => }/.gitignore | 0 feature/signin/data/api/build.gradle.kts | 28 ------------------- .../signin/data/api/AuthFailureException.kt | 3 -- .../signin/data/{impl => }/build.gradle.kts | 0 feature/signin/data/impl/.gitignore | 1 - .../data/impl/src/main/AndroidManifest.xml | 4 --- .../{api => }/src/main/AndroidManifest.xml | 0 .../feature/signin/data/di/FirebaseModule.kt | 0 .../signin/data/di/SignInDataModule.kt | 0 .../signin/data/impl/AuthRepositoryImpl.kt | 0 feature/signin/domain/build.gradle.kts | 3 +- settings.gradle.kts | 3 +- 13 files changed, 3 insertions(+), 41 deletions(-) rename feature/signin/data/{api => }/.gitignore (100%) delete mode 100644 feature/signin/data/api/build.gradle.kts delete mode 100644 feature/signin/data/api/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/api/AuthFailureException.kt rename feature/signin/data/{impl => }/build.gradle.kts (100%) delete mode 100644 feature/signin/data/impl/.gitignore delete mode 100644 feature/signin/data/impl/src/main/AndroidManifest.xml rename feature/signin/data/{api => }/src/main/AndroidManifest.xml (100%) rename feature/signin/data/{impl => }/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/FirebaseModule.kt (100%) rename feature/signin/data/{impl => }/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/SignInDataModule.kt (100%) rename feature/signin/data/{impl => }/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/impl/AuthRepositoryImpl.kt (100%) diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts index ee0979e..8596837 100644 --- a/core/testing/build.gradle.kts +++ b/core/testing/build.gradle.kts @@ -37,5 +37,5 @@ dependencies { implementation(libs.kotlinx.coroutines.test) implementation(projects.feature.repositories.domain) - implementation(projects.feature.signin.data.api) + implementation(projects.feature.signin.domain) } \ No newline at end of file diff --git a/feature/signin/data/api/.gitignore b/feature/signin/data/.gitignore similarity index 100% rename from feature/signin/data/api/.gitignore rename to feature/signin/data/.gitignore diff --git a/feature/signin/data/api/build.gradle.kts b/feature/signin/data/api/build.gradle.kts deleted file mode 100644 index 50bf549..0000000 --- a/feature/signin/data/api/build.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - alias(libs.plugins.android.library) - alias(libs.plugins.kotlinAndroid) - alias(libs.plugins.ksp) - - alias(libs.plugins.githubStarViewer.detekt) -} - -android { - namespace = "com.github.mikan.githubstarviewer.feature.signin.data.api" - compileSdk = 34 - - defaultConfig { - minSdk = 24 - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } -} - -dependencies { - implementation(libs.kotlinx.coroutines.android) -} diff --git a/feature/signin/data/api/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/api/AuthFailureException.kt b/feature/signin/data/api/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/api/AuthFailureException.kt deleted file mode 100644 index d8049b7..0000000 --- a/feature/signin/data/api/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/api/AuthFailureException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.mikan.githubstarviewer.feature.signin.data.api - -class AuthFailureException(throwable: Throwable) : Exception() diff --git a/feature/signin/data/impl/build.gradle.kts b/feature/signin/data/build.gradle.kts similarity index 100% rename from feature/signin/data/impl/build.gradle.kts rename to feature/signin/data/build.gradle.kts diff --git a/feature/signin/data/impl/.gitignore b/feature/signin/data/impl/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/feature/signin/data/impl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/feature/signin/data/impl/src/main/AndroidManifest.xml b/feature/signin/data/impl/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e6..0000000 --- a/feature/signin/data/impl/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/feature/signin/data/api/src/main/AndroidManifest.xml b/feature/signin/data/src/main/AndroidManifest.xml similarity index 100% rename from feature/signin/data/api/src/main/AndroidManifest.xml rename to feature/signin/data/src/main/AndroidManifest.xml diff --git a/feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/FirebaseModule.kt b/feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/FirebaseModule.kt similarity index 100% rename from feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/FirebaseModule.kt rename to feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/FirebaseModule.kt diff --git a/feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/SignInDataModule.kt b/feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/SignInDataModule.kt similarity index 100% rename from feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/SignInDataModule.kt rename to feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/di/SignInDataModule.kt diff --git a/feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/impl/AuthRepositoryImpl.kt b/feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/impl/AuthRepositoryImpl.kt similarity index 100% rename from feature/signin/data/impl/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/impl/AuthRepositoryImpl.kt rename to feature/signin/data/src/main/java/com/github/mikan/githubstarviewer/feature/signin/data/impl/AuthRepositoryImpl.kt diff --git a/feature/signin/domain/build.gradle.kts b/feature/signin/domain/build.gradle.kts index 5f0c1aa..f757e13 100644 --- a/feature/signin/domain/build.gradle.kts +++ b/feature/signin/domain/build.gradle.kts @@ -24,8 +24,7 @@ android { } dependencies { - implementation(projects.feature.signin.data.api) - runtimeOnly(projects.feature.signin.data.impl) + runtimeOnly(projects.feature.signin.data) implementation(libs.kotlinx.coroutines.android) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9bf9b79..5fc70db 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,5 +33,4 @@ include(":feature:repositories:ui") include(":feature:repositories:domain") include(":feature:signin:ui") include(":feature:signin:domain") -include(":feature:signin:data:api") -include(":feature:signin:data:impl") +include(":feature:signin:data")