diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..6d0ee1c2 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/core/data/src/main/java/com/goalpanzi/mission_mate/core/data/repository/LoginRepositoryImpl.kt b/core/data/src/main/java/com/goalpanzi/mission_mate/core/data/repository/LoginRepositoryImpl.kt index 5b257823..f7ebc6aa 100644 --- a/core/data/src/main/java/com/goalpanzi/mission_mate/core/data/repository/LoginRepositoryImpl.kt +++ b/core/data/src/main/java/com/goalpanzi/mission_mate/core/data/repository/LoginRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.goalpanzi.mission_mate.core.data.repository import com.goalpanzi.mission_mate.core.domain.repository.LoginRepository import com.goalpanzi.mission_mate.core.network.service.LoginService -import com.luckyoct.model.GoogleLogin -import com.luckyoct.model.request.GoogleLoginRequest +import com.luckyoct.core.model.GoogleLogin +import com.luckyoct.core.model.request.GoogleLoginRequest import javax.inject.Inject class LoginRepositoryImpl @Inject constructor( diff --git a/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/repository/LoginRepository.kt b/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/repository/LoginRepository.kt index dfe6f1fc..8796fb70 100644 --- a/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/repository/LoginRepository.kt +++ b/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/repository/LoginRepository.kt @@ -1,6 +1,6 @@ package com.goalpanzi.mission_mate.core.domain.repository -import com.luckyoct.model.GoogleLogin +import com.luckyoct.core.model.GoogleLogin interface LoginRepository { suspend fun requestGoogleLogin(token: String, email: String): GoogleLogin diff --git a/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt b/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt index 5ff15bce..63aea819 100644 --- a/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt +++ b/core/domain/src/main/java/com/goalpanzi/mission_mate/core/domain/usecase/LoginUseCase.kt @@ -1,7 +1,7 @@ package com.goalpanzi.mission_mate.core.domain.usecase import com.goalpanzi.mission_mate.core.domain.repository.LoginRepository -import com.luckyoct.model.GoogleLogin +import com.luckyoct.core.model.GoogleLogin import javax.inject.Inject class LoginUseCase @Inject constructor( diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index 9154e01d..f8036ed9 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "com.luckyoct.model" + namespace = "com.luckyoct.core.model" compileSdk = 34 defaultConfig { diff --git a/core/model/src/main/java/com/luckyoct/model/GoogleLogin.kt b/core/model/src/main/java/com/luckyoct/core/model/GoogleLogin.kt similarity index 84% rename from core/model/src/main/java/com/luckyoct/model/GoogleLogin.kt rename to core/model/src/main/java/com/luckyoct/core/model/GoogleLogin.kt index 406c5eca..6c31421d 100644 --- a/core/model/src/main/java/com/luckyoct/model/GoogleLogin.kt +++ b/core/model/src/main/java/com/luckyoct/core/model/GoogleLogin.kt @@ -1,4 +1,4 @@ -package com.luckyoct.model +package com.luckyoct.core.model import kotlinx.serialization.Serializable diff --git a/core/model/src/main/java/com/luckyoct/model/request/GoogleLoginRequest.kt b/core/model/src/main/java/com/luckyoct/core/model/request/GoogleLoginRequest.kt similarity index 78% rename from core/model/src/main/java/com/luckyoct/model/request/GoogleLoginRequest.kt rename to core/model/src/main/java/com/luckyoct/core/model/request/GoogleLoginRequest.kt index c844ac49..58cd0f23 100644 --- a/core/model/src/main/java/com/luckyoct/model/request/GoogleLoginRequest.kt +++ b/core/model/src/main/java/com/luckyoct/core/model/request/GoogleLoginRequest.kt @@ -1,4 +1,4 @@ -package com.luckyoct.model.request +package com.luckyoct.core.model.request import kotlinx.serialization.Serializable diff --git a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/LoginService.kt b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/LoginService.kt index 79c07b5c..e7a8d184 100644 --- a/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/LoginService.kt +++ b/core/network/src/main/java/com/goalpanzi/mission_mate/core/network/service/LoginService.kt @@ -1,7 +1,7 @@ package com.goalpanzi.mission_mate.core.network.service -import com.luckyoct.model.GoogleLogin -import com.luckyoct.model.request.GoogleLoginRequest +import com.luckyoct.core.model.GoogleLogin +import com.luckyoct.core.model.request.GoogleLoginRequest import retrofit2.http.Body import retrofit2.http.POST diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4246f804..dc40b48a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ kotest = "5.9.0" mockk = "1.13.11" ## Hilt -hilt = "2.51" +hilt = "2.51.1" hilt-navigation-compose = "1.2.0" ## Network