IdiotFrogs · Hyeonseo4799 · Dec 23, 2025 · Dec 22, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,7 +13,6 @@ dependencies {
     implementation(project(":feature:detail"))
     implementation(project(":feature:friend"))
     implementation(project(":core:designsystem"))
-    implementation(project(":core:data"))
     implementation(project(":core:navigation"))
     implementation(project(":common:resource"))
 

diff --git a/build-logic/src/main/kotlin/convention.android.feature.gradle.kts b/build-logic/src/main/kotlin/convention.android.feature.gradle.kts
@@ -11,10 +11,10 @@ android {
 }
 
 dependencies {
+    "implementation"(project(":data"))
+    "implementation"(project(":domain"))
     "implementation"(project(":common:resource"))
     "implementation"(project(":core:designsystem"))
-    "implementation"(project(":core:data"))
-    "implementation"(project(":core:domain"))
     "implementation"(project(":core:util"))
     implementation(project(":core:navigation"))
 }
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
diff --git a/core/datastore/src/androidTest/java/com/idiotfrogs/datastore/ExampleInstrumentedTest.kt b/core/datastore/src/androidTest/java/com/idiotfrogs/datastore/ExampleInstrumentedTest.kt
diff --git a/core/datastore/src/test/java/com/idiotfrogs/datastore/ExampleUnitTest.kt b/core/datastore/src/test/java/com/idiotfrogs/datastore/ExampleUnitTest.kt
diff --git a/core/domain/.gitignore b/core/domain/.gitignore
diff --git a/core/domain/proguard-rules.pro b/core/domain/proguard-rules.pro
diff --git a/core/domain/src/main/AndroidManifest.xml b/core/domain/src/main/AndroidManifest.xml
diff --git a/core/data/consumer-rules.pro → ...n/java/com/idiotfrogs/model/data/.gitkeep b/core/data/consumer-rules.pro → ...n/java/com/idiotfrogs/model/data/.gitkeep
diff --git a/core/datastore/consumer-rules.pro → ...java/com/idiotfrogs/model/domain/.gitkeep b/core/datastore/consumer-rules.pro → ...java/com/idiotfrogs/model/domain/.gitkeep
diff --git a/core/data/.gitignore → data/.gitignore b/core/data/.gitignore → data/.gitignore
diff --git a/core/data/build.gradle.kts → data/build.gradle.kts b/core/data/build.gradle.kts → data/build.gradle.kts
@@ -19,7 +19,6 @@ android {
 
 dependencies {
     implementation(project(":common:extension"))
-    implementation(project(":core:domain"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)

diff --git a/core/domain/consumer-rules.pro → data/consumer-rules.pro b/core/domain/consumer-rules.pro → data/consumer-rules.pro
diff --git a/core/data/proguard-rules.pro → data/proguard-rules.pro b/core/data/proguard-rules.pro → data/proguard-rules.pro
diff --git a/...diotfrogs/data/ExampleInstrumentedTest.kt → ...diotfrogs/data/ExampleInstrumentedTest.kt b/...diotfrogs/data/ExampleInstrumentedTest.kt → ...diotfrogs/data/ExampleInstrumentedTest.kt
diff --git a/core/data/src/main/AndroidManifest.xml → data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xml → data/src/main/AndroidManifest.xml
diff --git a/...main/exception/LoginCancelledException.kt → ...data/exception/LoginCancelledException.kt b/...main/exception/LoginCancelledException.kt → ...data/exception/LoginCancelledException.kt
@@ -1,3 +1,3 @@
-package com.idiotfrogs.domain.exception
+package com.idiotfrogs.data.exception
 
 class LoginCancelledException: Exception("User cancelled login")
diff --git a/data/src/main/java/com/idiotfrogs/data/local/.gitkeep b/data/src/main/java/com/idiotfrogs/data/local/.gitkeep
diff --git a/.../java/com/idiotfrogs/data/LoginManager.kt → ...om/idiotfrogs/data/remote/LoginManager.kt b/.../java/com/idiotfrogs/data/LoginManager.kt → ...om/idiotfrogs/data/remote/LoginManager.kt
@@ -1,4 +1,4 @@
-package com.idiotfrogs.data
+package com.idiotfrogs.data.remote
 
 import android.content.Context
 import androidx.credentials.CredentialManager
@@ -11,7 +11,8 @@ import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuthWebException
 import com.google.firebase.auth.OAuthProvider
-import com.idiotfrogs.domain.exception.LoginCancelledException
+import com.idiotfrogs.data.BuildConfig
+import com.idiotfrogs.data.exception.LoginCancelledException
 import com.idiotfrogs.extension.findActivity
 import dagger.hilt.android.qualifiers.ActivityContext
 import dagger.hilt.android.scopes.ActivityScoped

diff --git a/...va/com/idiotfrogs/data/ExampleUnitTest.kt → ...va/com/idiotfrogs/data/ExampleUnitTest.kt b/...va/com/idiotfrogs/data/ExampleUnitTest.kt → ...va/com/idiotfrogs/data/ExampleUnitTest.kt
diff --git a/core/datastore/.gitignore → domain/.gitignore b/core/datastore/.gitignore → domain/.gitignore
diff --git a/core/domain/build.gradle.kts → domain/build.gradle.kts b/core/domain/build.gradle.kts → domain/build.gradle.kts
@@ -7,6 +7,8 @@ android {
 }
 
 dependencies {
+    implementation(project(":data"))
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     testImplementation(libs.junit)

diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro
diff --git a/core/datastore/proguard-rules.pro → domain/proguard-rules.pro b/core/datastore/proguard-rules.pro → domain/proguard-rules.pro
diff --git a/...otfrogs/domain/ExampleInstrumentedTest.kt → ...otfrogs/domain/ExampleInstrumentedTest.kt b/...otfrogs/domain/ExampleInstrumentedTest.kt → ...otfrogs/domain/ExampleInstrumentedTest.kt
diff --git a/core/datastore/src/main/AndroidManifest.xml → domain/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xml → domain/src/main/AndroidManifest.xml
diff --git a/domain/src/main/java/com/idiotfrogs/domain/repository/impl/.gitkeep b/domain/src/main/java/com/idiotfrogs/domain/repository/impl/.gitkeep
diff --git a/.../com/idiotfrogs/domain/ExampleUnitTest.kt → .../com/idiotfrogs/domain/ExampleUnitTest.kt b/.../com/idiotfrogs/domain/ExampleUnitTest.kt → .../com/idiotfrogs/domain/ExampleUnitTest.kt
diff --git a/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt b/feature/auth/src/main/java/com/idiotfrogs/auth/login/LoginViewModel.kt
@@ -2,7 +2,7 @@ package com.idiotfrogs.auth.login
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.idiotfrogs.domain.exception.LoginCancelledException
+import com.idiotfrogs.data.exception.LoginCancelledException
 import com.idiotfrogs.util.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineExceptionHandler

diff --git a/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt b/feature/auth/src/main/java/com/idiotfrogs/auth/util/RememberLoginManager.kt
@@ -3,7 +3,7 @@ package com.idiotfrogs.auth.util
 import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import com.idiotfrogs.data.LoginManager
+import com.idiotfrogs.data.remote.LoginManager
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,16 +23,15 @@ dependencyResolutionManagement {
 rootProject.name = "MemorySeal"
 
 include(":app")
+include(":data")
+include(":domain")
 include(":common:extension")
 include(":common:resource")
 include(":common:notification")
 include(":core:navigation")
 include(":core:network")
-include(":core:data")
-include(":core:domain")
 include(":core:model")
 include(":core:designsystem")
-include(":core:datastore")
 include(":core:di")
 include(":core:util")
 include(":feature:auth")