Merge pull request #135 from YAPP-Github/chore/#134-update-orbit-mvi-v10.0.0

wjdrjs00 · web-flow · commit 67de431a66f5 · 2025-11-01T15:46:13.000+09:00
[Chore/#134] Orbit-MVI 라이브러리 버전을 업데이트 합니다. (v6.1.0 -> v10.0.0)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ espressoCore = "3.6.1"
 
 ## Other
 material = "1.12.0"
-orbit = "6.1.0"
+orbit = "10.0.0"
 javax = "1"
 kakaoLogin = "2.21.4"
 lottie-compose = "6.6.0"
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/mviviewmodel/MviViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/common/mviviewmodel/MviViewModel.kt
@@ -5,10 +5,7 @@ import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import org.orbitmvi.orbit.ContainerHost
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
-import org.orbitmvi.orbit.syntax.simple.intent
-import org.orbitmvi.orbit.syntax.simple.postSideEffect
-import org.orbitmvi.orbit.syntax.simple.reduce
+import org.orbitmvi.orbit.syntax.Syntax
 import org.orbitmvi.orbit.viewmodel.container
 
 abstract class MviViewModel<STATE : MviState, SIDE_EFFECT : MviSideEffect, INTENT : MviIntent>(
@@ -20,12 +17,8 @@ abstract class MviViewModel<STATE : MviState, SIDE_EFFECT : MviSideEffect, INTEN
     val stateFlow: StateFlow<STATE> get() = container.stateFlow
     val sideEffectFlow: Flow<SIDE_EFFECT> get() = container.sideEffectFlow
 
-    protected suspend fun SimpleSyntax<STATE, SIDE_EFFECT>.sendSideEffect(sideEffect: SIDE_EFFECT) = postSideEffect(sideEffect)
-
-    protected abstract suspend fun SimpleSyntax<STATE, SIDE_EFFECT>.reduceState(
-        intent: INTENT,
-        state: STATE,
-    ): STATE?
+    protected suspend fun Syntax<STATE, SIDE_EFFECT>.sendSideEffect(sideEffect: SIDE_EFFECT) = postSideEffect(sideEffect)
+    protected abstract suspend fun Syntax<STATE, SIDE_EFFECT>.reduceState(intent: INTENT, state: STATE): STATE?
 
     fun sendIntent(intent: INTENT) =
         intent {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionViewModel.kt
@@ -15,7 +15,7 @@ import com.threegap.bitnagil.presentation.emotion.model.mvi.EmotionState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -47,7 +47,7 @@ class EmotionViewModel @Inject constructor(
         }
     }
 
-    override suspend fun SimpleSyntax<EmotionState, EmotionSideEffect>.reduceState(intent: EmotionIntent, state: EmotionState): EmotionState? {
+    override suspend fun Syntax<EmotionState, EmotionSideEffect>.reduceState(intent: EmotionIntent, state: EmotionState): EmotionState? {
         when (intent) {
             is EmotionIntent.EmotionListLoadSuccess -> {
                 return state.copy(
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/guide/GuideViewModel.kt
@@ -6,7 +6,7 @@ import com.threegap.bitnagil.presentation.guide.model.GuideIntent
 import com.threegap.bitnagil.presentation.guide.model.GuideSideEffect
 import com.threegap.bitnagil.presentation.guide.model.GuideState
 import dagger.hilt.android.lifecycle.HiltViewModel
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -16,7 +16,7 @@ class GuideViewModel @Inject constructor(
     initState = GuideState(),
     savedStateHandle = savedStateHandle,
 ) {
-    override suspend fun SimpleSyntax<GuideState, GuideSideEffect>.reduceState(
+    override suspend fun Syntax<GuideState, GuideSideEffect>.reduceState(
         intent: GuideIntent,
         state: GuideState,
     ): GuideState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt
@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -61,7 +61,7 @@ class HomeViewModel @Inject constructor(
         fetchTodayEmotion(LocalDate.now())
     }
 
-    override suspend fun SimpleSyntax<HomeState, HomeSideEffect>.reduceState(
+    override suspend fun Syntax<HomeState, HomeSideEffect>.reduceState(
         intent: HomeIntent,
         state: HomeState,
     ): HomeState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt
@@ -11,7 +11,7 @@ import com.threegap.bitnagil.presentation.login.model.LoginSideEffect
 import com.threegap.bitnagil.presentation.login.model.LoginState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -22,7 +22,7 @@ class LoginViewModel @Inject constructor(
     initState = LoginState(),
     savedStateHandle = savedStateHandle,
 ) {
-    override suspend fun SimpleSyntax<LoginState, LoginSideEffect>.reduceState(
+    override suspend fun Syntax<LoginState, LoginSideEffect>.reduceState(
         intent: LoginIntent,
         state: LoginState,
     ): LoginState? =
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageViewModel.kt
@@ -9,7 +9,7 @@ import com.threegap.bitnagil.presentation.mypage.model.MyPageSideEffect
 import com.threegap.bitnagil.presentation.mypage.model.MyPageState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -41,7 +41,7 @@ class MyPageViewModel @Inject constructor(
         }
     }
 
-    override suspend fun SimpleSyntax<MyPageState, MyPageSideEffect>.reduceState(
+    override suspend fun Syntax<MyPageState, MyPageSideEffect>.reduceState(
         intent: MyPageIntent,
         state: MyPageState,
     ): MyPageState {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/OnBoardingViewModel.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 
 @HiltViewModel(assistedFactory = OnBoardingViewModel.Factory::class)
 class OnBoardingViewModel @AssistedInject constructor(
@@ -119,7 +119,7 @@ class OnBoardingViewModel @AssistedInject constructor(
         }
     }
 
-    override suspend fun SimpleSyntax<OnBoardingState, OnBoardingSideEffect>.reduceState(
+    override suspend fun Syntax<OnBoardingState, OnBoardingSideEffect>.reduceState(
         intent: OnBoardingIntent,
         state: OnBoardingState,
     ): OnBoardingState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt
@@ -15,7 +15,7 @@ import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutin
 import com.threegap.bitnagil.presentation.recommendroutine.model.toUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -35,7 +35,7 @@ class RecommendRoutineViewModel @Inject constructor(
 
     private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel()
 
-    override suspend fun SimpleSyntax<RecommendRoutineState, RecommendRoutineSideEffect>.reduceState(
+    override suspend fun Syntax<RecommendRoutineState, RecommendRoutineSideEffect>.reduceState(
         intent: RecommendRoutineIntent,
         state: RecommendRoutineState,
     ): RecommendRoutineState? = when (intent) {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt
@@ -15,7 +15,7 @@ import com.threegap.bitnagil.presentation.routinelist.model.RoutineListState
 import com.threegap.bitnagil.presentation.routinelist.model.toUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -43,7 +43,7 @@ class RoutineListViewModel @Inject constructor(
         observeRoutineChanges()
     }
 
-    override suspend fun SimpleSyntax<RoutineListState, RoutineListSideEffect>.reduceState(
+    override suspend fun Syntax<RoutineListState, RoutineListSideEffect>.reduceState(
         intent: RoutineListIntent,
         state: RoutineListState,
     ): RoutineListState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingViewModel.kt
@@ -11,7 +11,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -25,7 +25,7 @@ class SettingViewModel @Inject constructor(
     private var setServiceAlarmJob: Job? = null
     private var setPushAlarmJob: Job? = null
 
-    override suspend fun SimpleSyntax<SettingState, SettingSideEffect>.reduceState(
+    override suspend fun Syntax<SettingState, SettingSideEffect>.reduceState(
         intent: SettingIntent,
         state: SettingState,
     ): SettingState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/splash/SplashViewModel.kt
@@ -13,7 +13,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeoutOrNull
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -30,7 +30,7 @@ class SplashViewModel @Inject constructor(
         performForceUpdateCheck()
     }
 
-    override suspend fun SimpleSyntax<SplashState, SplashSideEffect>.reduceState(
+    override suspend fun Syntax<SplashState, SplashSideEffect>.reduceState(
         intent: SplashIntent,
         state: SplashState,
     ): SplashState? =
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/terms/TermsAgreementViewModel.kt
@@ -11,7 +11,7 @@ import com.threegap.bitnagil.presentation.terms.model.TermsAgreementSideEffect
 import com.threegap.bitnagil.presentation.terms.model.TermsAgreementState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -22,7 +22,7 @@ class TermsAgreementViewModel @Inject constructor(
     initState = TermsAgreementState(),
     savedStateHandle = savedStateHandle,
 ) {
-    override suspend fun SimpleSyntax<TermsAgreementState, TermsAgreementSideEffect>.reduceState(
+    override suspend fun Syntax<TermsAgreementState, TermsAgreementSideEffect>.reduceState(
         intent: TermsAgreementIntent,
         state: TermsAgreementState,
     ): TermsAgreementState? = when (intent) {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/withdrawal/WithdrawalViewModel.kt
@@ -9,7 +9,7 @@ import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalSideEffect
 import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import javax.inject.Inject
 
 @HiltViewModel
@@ -20,7 +20,7 @@ class WithdrawalViewModel @Inject constructor(
     savedStateHandle = savedStateHandle,
     initState = WithdrawalState(),
 ) {
-    override suspend fun SimpleSyntax<WithdrawalState, WithdrawalSideEffect>.reduceState(
+    override suspend fun Syntax<WithdrawalState, WithdrawalSideEffect>.reduceState(
         intent: WithdrawalIntent,
         state: WithdrawalState,
     ): WithdrawalState? {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt
@@ -25,7 +25,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 
 @HiltViewModel(assistedFactory = WriteRoutineViewModel.Factory::class)
 class WriteRoutineViewModel @AssistedInject constructor(
@@ -133,7 +133,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
         }
     }
 
-    override suspend fun SimpleSyntax<WriteRoutineState, WriteRoutineSideEffect>.reduceState(
+    override suspend fun Syntax<WriteRoutineState, WriteRoutineSideEffect>.reduceState(
         intent: WriteRoutineIntent,
         state: WriteRoutineState,
     ): WriteRoutineState? {
diff --git a/presentation/src/test/java/com/threegap/bitnagil/presentation/common/mviviewmodel/MviViewModelTest.kt b/presentation/src/test/java/com/threegap/bitnagil/presentation/common/mviviewmodel/MviViewModelTest.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.test.runTest
 import kotlinx.parcelize.Parcelize
 import org.junit.Before
 import org.junit.Test
-import org.orbitmvi.orbit.syntax.simple.SimpleSyntax
+import org.orbitmvi.orbit.syntax.Syntax
 import org.orbitmvi.orbit.test.test
 
 @ExperimentalCoroutinesApi
@@ -26,7 +26,6 @@ class MviViewModelTest {
                 containerHost.sendIntent(SampleIntent.Decrease(number = 2))
                 containerHost.sendIntent(SampleIntent.Increase(number = 3))
 
-                expectState { SampleState() }
                 expectState { SampleState(count = 1) }
                 expectState { SampleState(count = -1) }
                 expectState { SampleState(count = 2) }
@@ -42,7 +41,6 @@ class MviViewModelTest {
                 containerHost.sendIntent(SampleIntent.Decrease(number = 2))
                 containerHost.sendIntent(SampleIntent.Increase(number = 3))
 
-                expectState { SampleState() }
                 expectState { SampleState(count = 1) }
                 expectSideEffect(SampleSideEffect.ShowToast("Clear"))
                 expectState { SampleState() }
@@ -56,7 +54,7 @@ class MviViewModelTest {
         initState: SampleState,
         savedStateHandle: SavedStateHandle,
     ) : MviViewModel<SampleState, SampleSideEffect, SampleIntent>(initState, savedStateHandle) {
-        override suspend fun SimpleSyntax<SampleState, SampleSideEffect>.reduceState(
+        override suspend fun Syntax<SampleState, SampleSideEffect>.reduceState(
             intent: SampleIntent,
             state: SampleState,
         ): SampleState? {
