From 2af81c64de88d2684680adafede258420eb4e17a Mon Sep 17 00:00:00 2001 From: Vitaly Pestryakov <34812712+dsvag@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:57:20 +0300 Subject: [PATCH] replace package from vivid.money to money.vivid --- elmslie-android/build.gradle.kts | 2 +- elmslie-android/src/main/AndroidManifest.xml | 4 ++-- .../logger/DefaultLoggerConfigurations.kt | 18 ------------------ .../vivid}/elmslie/android/ElmStoreLazy.kt | 10 +++++----- .../logger/DefaultLoggerConfigurations.kt | 18 ++++++++++++++++++ .../android/logger/DefaultLoggerInitializer.kt | 4 ++-- .../android/logger/EmptyContentProvider.kt | 2 +- .../android/logger/strategy/AndroidLog.kt | 4 ++-- .../elmslie/android/logger/strategy/Crash.kt | 6 +++--- .../EmptyActivityLifecycleCallbacks.kt | 2 +- .../processdeath/ProcessDeathDetector.kt | 2 +- .../ProcessDeathDetectorInitializer.kt | 2 +- .../elmslie/android/renderer/ElmRenderer.kt | 9 +++++---- .../android/renderer/ElmRendererDelegate.kt | 2 +- .../vivid}/elmslie/android/util/FastLazy.kt | 2 +- .../money/vivid}/elmslie/core/ElmScope.kt | 4 ++-- .../elmslie/core/config/ElmslieConfig.kt | 10 +++++----- .../core/logger/ElmslieLogConfiguration.kt | 4 ++-- .../elmslie/core/logger/ElmslieLogger.kt | 6 +++--- .../vivid}/elmslie/core/logger/LogSeverity.kt | 2 +- .../elmslie/core/logger/strategy/IgnoreLog.kt | 2 +- .../core/logger/strategy/LogStrategy.kt | 4 ++-- .../money/vivid}/elmslie/core/store/Actor.kt | 2 +- .../core/store/EffectCachingElmStore.kt | 4 ++-- .../vivid}/elmslie/core/store/ElmStore.kt | 6 +++--- .../vivid}/elmslie/core/store/NoOpActor.kt | 2 +- .../vivid}/elmslie/core/store/NoOpReducer.kt | 2 +- .../money/vivid}/elmslie/core/store/Result.kt | 2 +- .../vivid}/elmslie/core/store/StateReducer.kt | 2 +- .../money/vivid}/elmslie/core/store/Store.kt | 2 +- .../vivid}/elmslie/core/store/StoreListener.kt | 2 +- .../elmslie/core/store/dsl/DslReducer.kt | 4 ++-- .../core/store/dsl/OperationsBuilder.kt | 2 +- .../elmslie/core/store/dsl/ResultBuilder.kt | 4 ++-- .../elmslie/core/store/dsl/ScreenDslReducer.kt | 7 ++++--- .../vivid}/elmslie/core/switcher/Switcher.kt | 4 ++-- .../core/store/EffectCachingElmStoreTest.kt | 12 ++++++------ .../vivid}/elmslie/core/store/ElmStoreTest.kt | 12 ++++++------ .../elmslie/core/store/dsl/DslReducerTest.kt | 2 +- .../vivid}/elmslie/core/store/dsl/Models.kt | 2 +- .../core/store/dsl/ScreenDslReducerTest.kt | 2 +- .../elmslie/core/testutil/model/StoreModels.kt | 2 +- samples/coroutines-loader/build.gradle.kts | 2 +- .../samples/coroutines/timer/MainActivity.kt | 2 +- .../samples/coroutines/timer/MainFragment.kt | 16 ++++++++-------- .../coroutines/timer/elm/StoreFactory.kt | 4 ++-- .../samples/coroutines/timer/elm/TimerActor.kt | 6 +++--- .../coroutines/timer/elm/TimerModels.kt | 2 +- .../coroutines/timer/elm/TimerReducer.kt | 4 ++-- .../elmslie/samples/calculator/Calculator.kt | 2 +- .../elmslie/samples/calculator/Models.kt | 2 +- .../vivid}/elmslie/samples/calculator/Store.kt | 10 +++++----- .../elmslie/samples/calculator/StoreTest.kt | 4 ++-- 53 files changed, 126 insertions(+), 124 deletions(-) delete mode 100644 elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerConfigurations.kt rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/ElmStoreLazy.kt (95%) create mode 100644 elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerConfigurations.kt rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/logger/DefaultLoggerInitializer.kt (83%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/logger/EmptyContentProvider.kt (95%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/logger/strategy/AndroidLog.kt (78%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/logger/strategy/Crash.kt (76%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt (93%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/processdeath/ProcessDeathDetector.kt (94%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt (88%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/renderer/ElmRenderer.kt (96%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/renderer/ElmRendererDelegate.kt (86%) rename elmslie-android/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/android/util/FastLazy.kt (79%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/ElmScope.kt (87%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/config/ElmslieConfig.kt (86%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/logger/ElmslieLogConfiguration.kt (89%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/logger/ElmslieLogger.kt (87%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/logger/LogSeverity.kt (61%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/logger/strategy/IgnoreLog.kt (66%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/logger/strategy/LogStrategy.kt (64%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/Actor.kt (94%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/EffectCachingElmStore.kt (95%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/ElmStore.kt (97%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/NoOpActor.kt (88%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/NoOpReducer.kt (88%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/Result.kt (95%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/StateReducer.kt (80%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/Store.kt (97%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/StoreListener.kt (93%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/DslReducer.kt (82%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/OperationsBuilder.kt (86%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/ResultBuilder.kt (89%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/ScreenDslReducer.kt (82%) rename elmslie-core/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/core/switcher/Switcher.kt (95%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/EffectCachingElmStoreTest.kt (94%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/ElmStoreTest.kt (96%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/DslReducerTest.kt (98%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/Models.kt (93%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/store/dsl/ScreenDslReducerTest.kt (98%) rename elmslie-core/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/core/testutil/model/StoreModels.kt (76%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/MainActivity.kt (91%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/MainFragment.kt (83%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/elm/StoreFactory.kt (75%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/elm/TimerActor.kt (83%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/elm/TimerModels.kt (90%) rename samples/coroutines-loader/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/coroutines/timer/elm/TimerReducer.kt (91%) rename samples/kotlin-calculator/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/calculator/Calculator.kt (94%) rename samples/kotlin-calculator/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/calculator/Models.kt (93%) rename samples/kotlin-calculator/src/main/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/calculator/Store.kt (84%) rename samples/kotlin-calculator/src/test/{java/vivid/money => kotlin/money/vivid}/elmslie/samples/calculator/StoreTest.kt (98%) diff --git a/elmslie-android/build.gradle.kts b/elmslie-android/build.gradle.kts index 6b558d19..67e17879 100644 --- a/elmslie-android/build.gradle.kts +++ b/elmslie-android/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } android { - namespace = "vivid.money.elmslie.android" + namespace = "money.vivid.elmslie.android" } dependencies { diff --git a/elmslie-android/src/main/AndroidManifest.xml b/elmslie-android/src/main/AndroidManifest.xml index 9dc9da1a..9b86c0a9 100644 --- a/elmslie-android/src/main/AndroidManifest.xml +++ b/elmslie-android/src/main/AndroidManifest.xml @@ -8,10 +8,10 @@ android:exported="false" tools:node="merge"> diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerConfigurations.kt b/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerConfigurations.kt deleted file mode 100644 index ff055286..00000000 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerConfigurations.kt +++ /dev/null @@ -1,18 +0,0 @@ -package vivid.money.elmslie.android.logger - -import vivid.money.elmslie.android.logger.strategy.Crash -import vivid.money.elmslie.android.logger.strategy.AndroidLog -import vivid.money.elmslie.core.config.ElmslieConfig -import vivid.money.elmslie.core.logger.strategy.IgnoreLog - -fun ElmslieConfig.defaultReleaseLogger() = logger { - fatal(Crash) - nonfatal(IgnoreLog) - debug(IgnoreLog) -} - -fun ElmslieConfig.defaultDebugLogger() = logger { - fatal(Crash) - nonfatal(AndroidLog.E) - debug(AndroidLog.E) -} diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/ElmStoreLazy.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/ElmStoreLazy.kt similarity index 95% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/ElmStoreLazy.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/ElmStoreLazy.kt index 1fae85af..10bc7594 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/ElmStoreLazy.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/ElmStoreLazy.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android +package money.vivid.elmslie.android import android.os.Bundle import androidx.activity.ComponentActivity @@ -11,8 +11,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelStoreOwner import androidx.savedstate.SavedStateRegistryOwner -import vivid.money.elmslie.core.store.Store -import vivid.money.elmslie.core.store.toCachedStore +import money.vivid.elmslie.core.store.Store +import money.vivid.elmslie.core.store.toCachedStore /** * In order to access previously saved state (via [saveState]) in [storeFactory] one must use @@ -31,7 +31,7 @@ fun < saveState: Bundle.(State) -> Unit = {}, storeFactory: SavedStateHandle.() -> Store, ): Lazy> = - vivid.money.elmslie.android.elmStore( + money.vivid.elmslie.android.elmStore( storeFactory = storeFactory, key = key, viewModelStoreOwner = viewModelStoreOwner, @@ -57,7 +57,7 @@ fun < saveState: Bundle.(State) -> Unit = {}, storeFactory: SavedStateHandle.() -> Store, ): Lazy> = - vivid.money.elmslie.android.elmStore( + money.vivid.elmslie.android.elmStore( storeFactory = storeFactory, key = key, viewModelStoreOwner = viewModelStoreOwner, diff --git a/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerConfigurations.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerConfigurations.kt new file mode 100644 index 00000000..9560446f --- /dev/null +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerConfigurations.kt @@ -0,0 +1,18 @@ +package money.vivid.elmslie.android.logger + +import money.vivid.elmslie.android.logger.strategy.AndroidLog +import money.vivid.elmslie.android.logger.strategy.Crash +import money.vivid.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.logger.strategy.IgnoreLog + +fun ElmslieConfig.defaultReleaseLogger() = logger { + fatal(Crash) + nonfatal(IgnoreLog) + debug(IgnoreLog) +} + +fun ElmslieConfig.defaultDebugLogger() = logger { + fatal(Crash) + nonfatal(AndroidLog.E) + debug(AndroidLog.E) +} diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerInitializer.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerInitializer.kt similarity index 83% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerInitializer.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerInitializer.kt index d55de519..2ee33437 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/DefaultLoggerInitializer.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/DefaultLoggerInitializer.kt @@ -1,9 +1,9 @@ -package vivid.money.elmslie.android.logger +package money.vivid.elmslie.android.logger import android.content.Context import android.content.pm.ApplicationInfo import androidx.startup.Initializer -import vivid.money.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.config.ElmslieConfig class DefaultLoggerInitializer : Initializer { diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/EmptyContentProvider.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/EmptyContentProvider.kt similarity index 95% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/logger/EmptyContentProvider.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/EmptyContentProvider.kt index de8813e6..d479d3b7 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/EmptyContentProvider.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/EmptyContentProvider.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.logger +package money.vivid.elmslie.android.logger import android.content.ContentProvider import android.content.ContentValues diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/AndroidLog.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/AndroidLog.kt similarity index 78% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/AndroidLog.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/AndroidLog.kt index 942c9422..57f594e4 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/AndroidLog.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/AndroidLog.kt @@ -1,7 +1,7 @@ -package vivid.money.elmslie.android.logger.strategy +package money.vivid.elmslie.android.logger.strategy import android.util.Log -import vivid.money.elmslie.core.logger.strategy.LogStrategy +import money.vivid.elmslie.core.logger.strategy.LogStrategy /** Uses default android logging mechanism for reporting */ object AndroidLog { diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/Crash.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/Crash.kt similarity index 76% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/Crash.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/Crash.kt index 823182ef..b5709387 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/logger/strategy/Crash.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/logger/strategy/Crash.kt @@ -1,10 +1,10 @@ -package vivid.money.elmslie.android.logger.strategy +package money.vivid.elmslie.android.logger.strategy import android.os.Handler import android.os.Looper import android.os.Message -import vivid.money.elmslie.core.logger.LogSeverity -import vivid.money.elmslie.core.logger.strategy.LogStrategy +import money.vivid.elmslie.core.logger.LogSeverity +import money.vivid.elmslie.core.logger.strategy.LogStrategy /** Strategy that performs a crash on every log event it receives. Use wisely. */ object Crash : LogStrategy { diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt similarity index 93% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt index fa72702c..93b9cddc 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/EmptyActivityLifecycleCallbacks.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.processdeath +package money.vivid.elmslie.android.processdeath import android.app.Activity import android.app.Application diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetector.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetector.kt similarity index 94% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetector.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetector.kt index 83291006..90a7b6b8 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetector.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetector.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.processdeath +package money.vivid.elmslie.android.processdeath import android.app.Activity import android.app.Application diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt similarity index 88% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt index be3ed2b4..e1e6d455 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/processdeath/ProcessDeathDetectorInitializer.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.processdeath +package money.vivid.elmslie.android.processdeath import android.app.Application import android.content.Context diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRenderer.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRenderer.kt similarity index 96% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRenderer.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRenderer.kt index 9350c353..b555d54a 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRenderer.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRenderer.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.renderer +package money.vivid.elmslie.android.renderer import android.os.Bundle import androidx.activity.ComponentActivity @@ -21,8 +21,9 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import vivid.money.elmslie.core.config.ElmslieConfig -import vivid.money.elmslie.core.store.Store +import money.vivid.elmslie.android.elmStore +import money.vivid.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.store.Store @Suppress("LongParameterList") @MainThread @@ -40,7 +41,7 @@ fun < saveState: Bundle.(State) -> Unit = {}, storeFactory: SavedStateHandle.() -> Store, ): Lazy> { - val lazyStore = vivid.money.elmslie.android.elmStore( + val lazyStore = elmStore( storeFactory = storeFactory, key = key, viewModelStoreOwner = viewModelStoreOwner, diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRendererDelegate.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRendererDelegate.kt similarity index 86% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRendererDelegate.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRendererDelegate.kt index 22b9ccd4..718c6e4b 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/renderer/ElmRendererDelegate.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRendererDelegate.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.renderer +package money.vivid.elmslie.android.renderer @Suppress("OptionalUnit") interface ElmRendererDelegate { diff --git a/elmslie-android/src/main/java/vivid/money/elmslie/android/util/FastLazy.kt b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/util/FastLazy.kt similarity index 79% rename from elmslie-android/src/main/java/vivid/money/elmslie/android/util/FastLazy.kt rename to elmslie-android/src/main/kotlin/money/vivid/elmslie/android/util/FastLazy.kt index 8296ca18..1e6667fc 100644 --- a/elmslie-android/src/main/java/vivid/money/elmslie/android/util/FastLazy.kt +++ b/elmslie-android/src/main/kotlin/money/vivid/elmslie/android/util/FastLazy.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.android.util +package money.vivid.elmslie.android.util /** * Lazy initialization without synchronization diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/ElmScope.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/ElmScope.kt similarity index 87% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/ElmScope.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/ElmScope.kt index ca0989ab..0fe5e087 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/ElmScope.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/ElmScope.kt @@ -1,10 +1,10 @@ -package vivid.money.elmslie.core +package money.vivid.elmslie.core import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob -import vivid.money.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.config.ElmslieConfig @SuppressWarnings("detekt.FunctionNaming") fun ElmScope(name: String): CoroutineScope = diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/config/ElmslieConfig.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/config/ElmslieConfig.kt similarity index 86% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/config/ElmslieConfig.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/config/ElmslieConfig.kt index 61dcd42b..c1cb63d5 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/config/ElmslieConfig.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/config/ElmslieConfig.kt @@ -1,11 +1,11 @@ -package vivid.money.elmslie.core.config +package money.vivid.elmslie.core.config import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers -import vivid.money.elmslie.core.logger.ElmslieLogConfiguration -import vivid.money.elmslie.core.logger.ElmslieLogger -import vivid.money.elmslie.core.logger.strategy.IgnoreLog -import vivid.money.elmslie.core.store.StoreListener +import money.vivid.elmslie.core.logger.ElmslieLogConfiguration +import money.vivid.elmslie.core.logger.ElmslieLogger +import money.vivid.elmslie.core.logger.strategy.IgnoreLog +import money.vivid.elmslie.core.store.StoreListener object ElmslieConfig { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogConfiguration.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogConfiguration.kt similarity index 89% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogConfiguration.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogConfiguration.kt index 50d255e1..c3220428 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogConfiguration.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogConfiguration.kt @@ -1,6 +1,6 @@ -package vivid.money.elmslie.core.logger +package money.vivid.elmslie.core.logger -import vivid.money.elmslie.core.logger.strategy.LogStrategy +import money.vivid.elmslie.core.logger.strategy.LogStrategy class ElmslieLogConfiguration { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogger.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogger.kt similarity index 87% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogger.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogger.kt index c08fb64f..a59a40c1 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/ElmslieLogger.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/ElmslieLogger.kt @@ -1,7 +1,7 @@ -package vivid.money.elmslie.core.logger +package money.vivid.elmslie.core.logger -import vivid.money.elmslie.core.logger.strategy.IgnoreLog -import vivid.money.elmslie.core.logger.strategy.LogStrategy +import money.vivid.elmslie.core.logger.strategy.IgnoreLog +import money.vivid.elmslie.core.logger.strategy.LogStrategy /** Logs events happening in the Elmslie library */ class ElmslieLogger( diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/LogSeverity.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/LogSeverity.kt similarity index 61% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/logger/LogSeverity.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/LogSeverity.kt index 75e85339..18d75ee7 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/LogSeverity.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/LogSeverity.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.logger +package money.vivid.elmslie.core.logger enum class LogSeverity { Fatal, diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/IgnoreLog.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/IgnoreLog.kt similarity index 66% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/IgnoreLog.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/IgnoreLog.kt index c40f018e..618c131c 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/IgnoreLog.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/IgnoreLog.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.logger.strategy +package money.vivid.elmslie.core.logger.strategy /** Ignores all log events */ object IgnoreLog : LogStrategy by LogStrategy({ _, _, _, _ -> }) diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/LogStrategy.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/LogStrategy.kt similarity index 64% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/LogStrategy.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/LogStrategy.kt index d2c5c630..b41cb3fa 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/logger/strategy/LogStrategy.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/logger/strategy/LogStrategy.kt @@ -1,6 +1,6 @@ -package vivid.money.elmslie.core.logger.strategy +package money.vivid.elmslie.core.logger.strategy -import vivid.money.elmslie.core.logger.LogSeverity +import money.vivid.elmslie.core.logger.LogSeverity /** Allows to provide custom logic for error handling */ fun interface LogStrategy { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Actor.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Actor.kt similarity index 94% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/Actor.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Actor.kt index 29652f68..c59efce6 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Actor.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Actor.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/EffectCachingElmStore.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStore.kt similarity index 95% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/EffectCachingElmStore.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStore.kt index cc2f2b04..37e1f8df 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/EffectCachingElmStore.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStore.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlinx.coroutines.cancel import kotlinx.coroutines.flow.Flow @@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.onSubscription import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import vivid.money.elmslie.core.ElmScope +import money.vivid.elmslie.core.ElmScope /** * Caches effects until there is at least one collector. diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/ElmStore.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/ElmStore.kt similarity index 97% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/ElmStore.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/ElmStore.kt index 7099cee6..5893a6ad 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/ElmStore.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/ElmStore.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlinx.coroutines.CancellationException import kotlinx.coroutines.cancel @@ -15,8 +15,8 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import vivid.money.elmslie.core.ElmScope -import vivid.money.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.ElmScope +import money.vivid.elmslie.core.config.ElmslieConfig @Suppress("TooGenericExceptionCaught") class ElmStore( diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpActor.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpActor.kt similarity index 88% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpActor.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpActor.kt index 0ec0f129..fab783d2 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpActor.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpActor.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpReducer.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpReducer.kt similarity index 88% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpReducer.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpReducer.kt index c3780e2c..2957dcc6 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/NoOpReducer.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/NoOpReducer.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store /** * Reducer that doesn't change state, and doesn't emit commands or effects diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Result.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Result.kt similarity index 95% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/Result.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Result.kt index 5c90fb46..d0f3885c 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Result.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Result.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store /** Represents result of reduce function */ data class Result( diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/StateReducer.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StateReducer.kt similarity index 80% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/StateReducer.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StateReducer.kt index 621eda49..8bc43319 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/StateReducer.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StateReducer.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store fun interface StateReducer { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Store.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Store.kt similarity index 97% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/Store.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Store.kt index 583620ac..18c63312 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/Store.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/Store.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/StoreListener.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StoreListener.kt similarity index 93% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/StoreListener.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StoreListener.kt index 43e56499..9b8d20e4 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/StoreListener.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/StoreListener.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store interface StoreListener { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/DslReducer.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/DslReducer.kt similarity index 82% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/DslReducer.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/DslReducer.kt index b66da690..2d67d09c 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/DslReducer.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/DslReducer.kt @@ -1,6 +1,6 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl -import vivid.money.elmslie.core.store.StateReducer +import money.vivid.elmslie.core.store.StateReducer abstract class DslReducer : StateReducer { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/OperationsBuilder.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/OperationsBuilder.kt similarity index 86% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/OperationsBuilder.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/OperationsBuilder.kt index 79071ff6..bb9d9ddc 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/OperationsBuilder.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/OperationsBuilder.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl @DslMarker internal annotation class OperationsBuilderDsl diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ResultBuilder.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ResultBuilder.kt similarity index 89% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ResultBuilder.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ResultBuilder.kt index 5a8c2e19..41d2ed42 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ResultBuilder.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ResultBuilder.kt @@ -1,6 +1,6 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl -import vivid.money.elmslie.core.store.Result +import money.vivid.elmslie.core.store.Result open class ResultBuilder( val initialState: State diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducer.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducer.kt similarity index 82% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducer.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducer.kt index 639aedaf..e50f073c 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducer.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducer.kt @@ -1,6 +1,7 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl -import vivid.money.elmslie.core.store.StateReducer +import money.vivid.elmslie.core.store.Result +import money.vivid.elmslie.core.store.StateReducer import kotlin.reflect.KClass abstract class ScreenDslReducer( @@ -17,7 +18,7 @@ abstract class ScreenDslReducer { + ): money.vivid.elmslie.core.store.Result { val body = Result(state) @Suppress("UNCHECKED_CAST") when { diff --git a/elmslie-core/src/main/java/vivid/money/elmslie/core/switcher/Switcher.kt b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/switcher/Switcher.kt similarity index 95% rename from elmslie-core/src/main/java/vivid/money/elmslie/core/switcher/Switcher.kt rename to elmslie-core/src/main/kotlin/money/vivid/elmslie/core/switcher/Switcher.kt index 5b8c6cad..e912f6df 100644 --- a/elmslie-core/src/main/java/vivid/money/elmslie/core/switcher/Switcher.kt +++ b/elmslie-core/src/main/kotlin/money/vivid/elmslie/core/switcher/Switcher.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.switcher +package money.vivid.elmslie.core.switcher import kotlinx.coroutines.channels.SendChannel import kotlinx.coroutines.delay @@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import vivid.money.elmslie.core.store.Actor +import money.vivid.elmslie.core.store.Actor /** * Allows to execute requests for [Actor] implementations in a switching manner. Each request diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/EffectCachingElmStoreTest.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStoreTest.kt similarity index 94% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/store/EffectCachingElmStoreTest.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStoreTest.kt index 3975fea5..d433e218 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/EffectCachingElmStoreTest.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStoreTest.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -14,11 +14,11 @@ import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.setMain -import vivid.money.elmslie.core.config.ElmslieConfig -import vivid.money.elmslie.core.testutil.model.Command -import vivid.money.elmslie.core.testutil.model.Effect -import vivid.money.elmslie.core.testutil.model.Event -import vivid.money.elmslie.core.testutil.model.State +import money.vivid.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.testutil.model.Command +import money.vivid.elmslie.core.testutil.model.Effect +import money.vivid.elmslie.core.testutil.model.Event +import money.vivid.elmslie.core.testutil.model.State @OptIn(ExperimentalCoroutinesApi::class) class EffectCachingElmStoreTest { diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/ElmStoreTest.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/ElmStoreTest.kt similarity index 96% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/store/ElmStoreTest.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/ElmStoreTest.kt index 7d9ac77f..b0c87fee 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/ElmStoreTest.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/ElmStoreTest.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store +package money.vivid.elmslie.core.store import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -19,11 +19,11 @@ import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.setMain -import vivid.money.elmslie.core.config.ElmslieConfig -import vivid.money.elmslie.core.testutil.model.Command -import vivid.money.elmslie.core.testutil.model.Effect -import vivid.money.elmslie.core.testutil.model.Event -import vivid.money.elmslie.core.testutil.model.State +import money.vivid.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.testutil.model.Command +import money.vivid.elmslie.core.testutil.model.Effect +import money.vivid.elmslie.core.testutil.model.Event +import money.vivid.elmslie.core.testutil.model.State @OptIn(ExperimentalCoroutinesApi::class) class ElmStoreTest { diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/DslReducerTest.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/DslReducerTest.kt similarity index 98% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/DslReducerTest.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/DslReducerTest.kt index 171c0769..82c25634 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/DslReducerTest.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/DslReducerTest.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl import kotlin.test.Test import kotlin.test.assertEquals diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/Models.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/Models.kt similarity index 93% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/Models.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/Models.kt index 885172c7..a215cd8c 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/Models.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/Models.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl data class TestState( val one: Int, diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducerTest.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducerTest.kt similarity index 98% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducerTest.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducerTest.kt index ba6f5a87..14fbf9f5 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/store/dsl/ScreenDslReducerTest.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/store/dsl/ScreenDslReducerTest.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.store.dsl +package money.vivid.elmslie.core.store.dsl import kotlin.test.Test import kotlin.test.assertEquals diff --git a/elmslie-core/src/test/java/vivid/money/elmslie/core/testutil/model/StoreModels.kt b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/testutil/model/StoreModels.kt similarity index 76% rename from elmslie-core/src/test/java/vivid/money/elmslie/core/testutil/model/StoreModels.kt rename to elmslie-core/src/test/kotlin/money/vivid/elmslie/core/testutil/model/StoreModels.kt index 875d30d9..e6578f03 100644 --- a/elmslie-core/src/test/java/vivid/money/elmslie/core/testutil/model/StoreModels.kt +++ b/elmslie-core/src/test/kotlin/money/vivid/elmslie/core/testutil/model/StoreModels.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.core.testutil.model +package money.vivid.elmslie.core.testutil.model data class Event(val value: Int = 0) data class State(val value: Int = 0) diff --git a/samples/coroutines-loader/build.gradle.kts b/samples/coroutines-loader/build.gradle.kts index f29083d1..a0ac5823 100644 --- a/samples/coroutines-loader/build.gradle.kts +++ b/samples/coroutines-loader/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "vivid.money.elmslie.samples.coroutines.timer" + namespace = "money.vivid.elmslie.samples.coroutines.timer" compileSdk = 33 buildToolsVersion = "31.0.0" diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainActivity.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainActivity.kt similarity index 91% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainActivity.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainActivity.kt index 8de12cdd..c3f78f61 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainActivity.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainActivity.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.coroutines.timer +package money.vivid.elmslie.samples.coroutines.timer import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainFragment.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainFragment.kt similarity index 83% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainFragment.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainFragment.kt index f9c98ed3..cd2b3814 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/MainFragment.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/MainFragment.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.coroutines.timer +package money.vivid.elmslie.samples.coroutines.timer import android.annotation.SuppressLint import android.os.Bundle @@ -10,13 +10,13 @@ import android.widget.TextView import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.google.android.material.snackbar.Snackbar -import vivid.money.elmslie.android.RetainedElmStore.Companion.StateBundleKey -import vivid.money.elmslie.android.renderer.ElmRendererDelegate -import vivid.money.elmslie.android.renderer.elmStoreWithRenderer -import vivid.money.elmslie.samples.coroutines.timer.elm.Effect -import vivid.money.elmslie.samples.coroutines.timer.elm.Event -import vivid.money.elmslie.samples.coroutines.timer.elm.State -import vivid.money.elmslie.samples.coroutines.timer.elm.storeFactory +import money.vivid.elmslie.android.RetainedElmStore.Companion.StateBundleKey +import money.vivid.elmslie.android.renderer.ElmRendererDelegate +import money.vivid.elmslie.android.renderer.elmStoreWithRenderer +import money.vivid.elmslie.samples.coroutines.timer.elm.Effect +import money.vivid.elmslie.samples.coroutines.timer.elm.Event +import money.vivid.elmslie.samples.coroutines.timer.elm.State +import money.vivid.elmslie.samples.coroutines.timer.elm.storeFactory internal class MainFragment : Fragment(R.layout.fragment_main), ElmRendererDelegate { diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/StoreFactory.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/StoreFactory.kt similarity index 75% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/StoreFactory.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/StoreFactory.kt index f1b16f08..83a37a88 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/StoreFactory.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/StoreFactory.kt @@ -1,6 +1,6 @@ -package vivid.money.elmslie.samples.coroutines.timer.elm +package money.vivid.elmslie.samples.coroutines.timer.elm -import vivid.money.elmslie.core.store.ElmStore +import money.vivid.elmslie.core.store.ElmStore internal fun storeFactory( id: String, diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerActor.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerActor.kt similarity index 83% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerActor.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerActor.kt index 80cd1738..ce9c076a 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerActor.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerActor.kt @@ -1,9 +1,9 @@ -package vivid.money.elmslie.samples.coroutines.timer.elm +package money.vivid.elmslie.samples.coroutines.timer.elm import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow -import vivid.money.elmslie.core.store.Actor -import vivid.money.elmslie.core.switcher.Switcher +import money.vivid.elmslie.core.store.Actor +import money.vivid.elmslie.core.switcher.Switcher internal object TimerActor : Actor() { diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerModels.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerModels.kt similarity index 90% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerModels.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerModels.kt index de388c36..1c9e7533 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerModels.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerModels.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.coroutines.timer.elm +package money.vivid.elmslie.samples.coroutines.timer.elm internal data class State( val id: String, diff --git a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerReducer.kt b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerReducer.kt similarity index 91% rename from samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerReducer.kt rename to samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerReducer.kt index cd302a26..769f5f1d 100644 --- a/samples/coroutines-loader/src/main/java/vivid/money/elmslie/samples/coroutines/timer/elm/TimerReducer.kt +++ b/samples/coroutines-loader/src/main/kotlin/money/vivid/elmslie/samples/coroutines/timer/elm/TimerReducer.kt @@ -1,7 +1,7 @@ -package vivid.money.elmslie.samples.coroutines.timer.elm +package money.vivid.elmslie.samples.coroutines.timer.elm +import money.vivid.elmslie.core.store.dsl.DslReducer import java.util.UUID -import vivid.money.elmslie.core.store.dsl.DslReducer internal object TimerReducer : DslReducer() { diff --git a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Calculator.kt b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Calculator.kt similarity index 94% rename from samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Calculator.kt rename to samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Calculator.kt index 02d531df..69f0e386 100644 --- a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Calculator.kt +++ b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Calculator.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.calculator +package money.vivid.elmslie.samples.calculator import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Models.kt b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Models.kt similarity index 93% rename from samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Models.kt rename to samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Models.kt index 1f704bb7..293466d8 100644 --- a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Models.kt +++ b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Models.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.calculator +package money.vivid.elmslie.samples.calculator sealed class Event { data class EnterDigit(val digit: Char) : Event() diff --git a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Store.kt b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Store.kt similarity index 84% rename from samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Store.kt rename to samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Store.kt index 5fa09c71..47000a5d 100644 --- a/samples/kotlin-calculator/src/main/java/vivid/money/elmslie/samples/calculator/Store.kt +++ b/samples/kotlin-calculator/src/main/kotlin/money/vivid/elmslie/samples/calculator/Store.kt @@ -1,9 +1,9 @@ -package vivid.money.elmslie.samples.calculator +package money.vivid.elmslie.samples.calculator -import vivid.money.elmslie.core.store.ElmStore -import vivid.money.elmslie.core.store.NoOpActor -import vivid.money.elmslie.core.store.StateReducer -import vivid.money.elmslie.core.store.Result +import money.vivid.elmslie.core.store.ElmStore +import money.vivid.elmslie.core.store.NoOpActor +import money.vivid.elmslie.core.store.StateReducer +import money.vivid.elmslie.core.store.Result private const val MAX_INPUT_LENGTH = 9 diff --git a/samples/kotlin-calculator/src/test/java/vivid/money/elmslie/samples/calculator/StoreTest.kt b/samples/kotlin-calculator/src/test/kotlin/money/vivid/elmslie/samples/calculator/StoreTest.kt similarity index 98% rename from samples/kotlin-calculator/src/test/java/vivid/money/elmslie/samples/calculator/StoreTest.kt rename to samples/kotlin-calculator/src/test/kotlin/money/vivid/elmslie/samples/calculator/StoreTest.kt index f4d66de6..78100b3d 100644 --- a/samples/kotlin-calculator/src/test/java/vivid/money/elmslie/samples/calculator/StoreTest.kt +++ b/samples/kotlin-calculator/src/test/kotlin/money/vivid/elmslie/samples/calculator/StoreTest.kt @@ -1,4 +1,4 @@ -package vivid.money.elmslie.samples.calculator +package money.vivid.elmslie.samples.calculator import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -13,7 +13,7 @@ import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.setMain -import vivid.money.elmslie.core.config.ElmslieConfig +import money.vivid.elmslie.core.config.ElmslieConfig @OptIn(ExperimentalCoroutinesApi::class) internal class StoreTest {