From f599d57068925f185d6dd02557b6864c761489b5 Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 18:47:16 +0100
Subject: [PATCH 1/7] fix: fix plugin live templates

---
 .idea/AndroidProjectSystem.xml                |  6 ++++
 .../flowmvi/test/store/NestedRecoverTest.kt   | 36 +++++++++++++++++++
 .../flowmvi/test/store/StoreExceptionsTest.kt |  5 +++
 .../src/main/resources/LiveTemplates.xml      | 33 +++++++++++------
 4 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/NestedRecoverTest.kt

diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/NestedRecoverTest.kt b/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/NestedRecoverTest.kt
new file mode 100644
index 00000000..d483696e
--- /dev/null
+++ b/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/NestedRecoverTest.kt
@@ -0,0 +1,36 @@
+package pro.respawn.flowmvi.test.store
+
+import io.kotest.assertions.throwables.shouldNotThrowAny
+import io.kotest.core.spec.style.FreeSpec
+import pro.respawn.flowmvi.logging.log
+import pro.respawn.flowmvi.plugins.init
+import pro.respawn.flowmvi.plugins.recover
+import pro.respawn.flowmvi.test.subscribeAndTest
+import pro.respawn.flowmvi.util.asUnconfined
+import pro.respawn.flowmvi.util.idle
+import pro.respawn.flowmvi.util.testStore
+
+class NestedRecoverTest : FreeSpec({
+    asUnconfined()
+    "Given a store that throws during state update in init" - {
+        val store = testStore {
+            init {
+                updateState {
+                    throw IllegalArgumentException()
+                }
+            }
+            recover {
+                log { "Caught exception $it" }
+                null
+            }
+        }
+
+        "then the store must not throw" {
+            shouldNotThrowAny {
+                store.subscribeAndTest {
+                    idle()
+                }
+            }
+        }
+    }
+})
diff --git a/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt b/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt
index 2791fdcb..5fbc1e05 100644
--- a/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt
+++ b/core/src/jvmTest/kotlin/pro/respawn/flowmvi/test/store/StoreExceptionsTest.kt
@@ -5,6 +5,7 @@ import io.kotest.core.spec.style.FreeSpec
 import io.kotest.matchers.collections.shouldBeSingleton
 import io.kotest.matchers.collections.shouldContain
 import io.kotest.matchers.collections.shouldContainExactly
+import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.CancellationException
@@ -46,6 +47,7 @@ class StoreExceptionsTest : FreeSpec({
                     idle()
                     plugin.starts shouldBe 1
                     plugin.exceptions.shouldContainExactly(e)
+                    isActive shouldBe true
                 }
             }
 
@@ -118,6 +120,9 @@ class StoreExceptionsTest : FreeSpec({
         }
         "and store that handles exceptions" - {
             val store = testStore(plugin) {
+                init {
+                    currentCoroutineContext()[RecoverModule].shouldBeNull()
+                }
                 recover {
                     currentCoroutineContext()[RecoverModule].shouldNotBeNull()
                     null
diff --git a/debugger/ideplugin/src/main/resources/LiveTemplates.xml b/debugger/ideplugin/src/main/resources/LiveTemplates.xml
index 34e469c5..f55c3110 100644
--- a/debugger/ideplugin/src/main/resources/LiveTemplates.xml
+++ b/debugger/ideplugin/src/main/resources/LiveTemplates.xml
@@ -2,31 +2,44 @@
   <template name="fmvic" value="import pro.respawn.flowmvi.api.Container&#10;import pro.respawn.flowmvi.api.PipelineContext&#10;import pro.respawn.flowmvi.dsl.store&#10;import pro.respawn.flowmvi.dsl.updateState&#10;import pro.respawn.flowmvi.dsl.withState&#10;import pro.respawn.flowmvi.plugins.recover&#10;import pro.respawn.flowmvi.plugins.reduce&#10;&#10;private typealias Ctx = PipelineContext&lt;$NAME$State, $NAME$Intent, $NAME$Action&gt;&#10;&#10;internal class $NAME$Container(&#10;    $PARAMS$&#10;) : Container&lt;$NAME$State, $NAME$Intent, $NAME$Action&gt; {&#10;&#10;    override val store = store(initial = $NAME$State.Loading) {&#10;        configure {&#10;            name = &quot;$NAME$&quot;&#10;        }&#10;        recover {&#10;            updateState { $NAME$State.Error(it) }&#10;            null&#10;        }&#10;        reduce { intent -&gt;&#10;            when(intent) {&#10;                $END$&#10;                else -&gt; TODO()&#10;            }&#10;        }&#10;    }&#10;}" shortcut="ENTER" description="FlowMVI Container" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="camelCase(String)" defaultValue="" alwaysStopAt="true" />
     <variable name="PARAMS" expression="" defaultValue=" " alwaysStopAt="false" />
-    <context />
+    <context>
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
   </template>
-  <template name="fmvis" value="import androidx.compose.runtime.Composable&#10;import pro.respawn.flowmvi.compose.dsl.subscribe&#10;import pro.respawn.flowmvi.compose.preview.EmptyReceiver&#10;import androidx.compose.runtime.getValue&#10;import pro.respawn.flowmvi.api.IntentReceiver&#10;&#10;@Composable&#10;fun $NAME$Screen(&#10;    container: $NAME$Container,&#10;) = with(container.store) {&#10;&#10;    val state by subscribe { action -&gt;&#10;        when(action) {&#10;            else -&gt; TODO()&#10;        }&#10;    }&#10;&#10;    $NAME$ScreenContent(state)&#10;}&#10;&#10;@Composable&#10;private fun IntentReceiver&lt;$NAME$Intent&gt;.$NAME$ScreenContent(&#10;    state: $NAME$State,&#10;) {&#10;    when(state) {&#10;        $END$&#10;        else -&gt; TODO()&#10;    }&#10;}&#10;&#10;@Composable&#10;@Preview&#10;private fun $NAME$ScreenPreview() = EmptyReceiver { &#10;    $NAME$ScreenContent(TODO()) &#10;}&#10;" shortcut="ENTER" description="FlowMVI Composable Screen" toReformat="true" toShortenFQNames="true">
+  <template name="fmvis" value="@Composable&#10;fun $NAME$Screen(&#10;    container: $NAME$Container,&#10;) = with(container.store) {&#10;&#10;    val state by subscribe { action -&gt;&#10;        when(action) {&#10;            else -&gt; TODO()&#10;        }&#10;    }&#10;&#10;    $NAME$ScreenContent(state)&#10;}&#10;&#10;@Composable&#10;private fun IntentReceiver&lt;$NAME$Intent&gt;.$NAME$ScreenContent(&#10;    state: $NAME$State,&#10;) {&#10;    when(state) {&#10;        $END$&#10;        else -&gt; TODO()&#10;    }&#10;}&#10;&#10;@Composable&#10;@Preview&#10;private fun $NAME$ScreenPreview() = EmptyReceiver { &#10;    $NAME$ScreenContent(TODO()) &#10;}&#10;" shortcut="ENTER" description="FlowMVI Composable Screen" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="camelCase(String)" defaultValue="" alwaysStopAt="true" />
-    <context />
+    <context>
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
   </template>
-  <template name="fmvip" value="/**&#10; * TODO: Add documentation&#10; **/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; $NAME$Plugin(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = plugin&lt;S, I, A&gt; {&#10;    this.name = name&#10;    &#10;    $END$&#10;}&#10;&#10;/**&#10; * Install a new [$NAME$Plugin]. &#10; * &#10;**/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = install($NAME$Plugin(name))" shortcut="ENTER" description="FlowMVI Plugin" toReformat="true" toShortenFQNames="true">
+  <template name="fmvip" value="/**&#10; * TODO: Add documentation&#10; **/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; $NAME$Plugin(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = plugin&lt;S, I, A&gt; {&#10;    this.name = name&#10;    &#10;    $END$&#10;}&#10;&#10;/**&#10; * Install a new [$NAME$Plugin].&#10;**/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = install($NAME$Plugin(name))" shortcut="ENTER" description="FlowMVI Plugin" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="kotlinFunctionName()" defaultValue="" alwaysStopAt="true" />
     <variable name="PluginName" expression="capitalize(NAME)" defaultValue="" alwaysStopAt="false" />
-    <context />
+    <context>
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
   </template>
-  <template name="fmvilp" value="/**&#10; * TODO: Add documentation&#10; **/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; $NAME$Plugin(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = lazyPlugin&lt;S, I, A&gt; {&#10;    this.name = name&#10;    &#10;    $END$&#10;}&#10;&#10;/**&#10; * Install a new [$NAME$Plugin]. &#10; * &#10;**/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = install($NAME$Plugin(name))" shortcut="ENTER" description="FlowMVI Lazy Plugin" toReformat="true" toShortenFQNames="true">
+  <template name="fmvilp" value="/**&#10; * TODO: Add documentation&#10; **/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; $NAME$Plugin(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = lazyPlugin&lt;S, I, A&gt; {&#10;    this.name = name&#10;    &#10;    $END$&#10;}&#10;&#10;/**&#10; * Install a new [$NAME$Plugin]. &#10;**/&#10;@FlowMVIDSL&#10;fun &lt;S: MVIState, I: MVIIntent, A: MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$PluginName$Plugin&quot;,&#10;) = install($NAME$Plugin(name))" shortcut="ENTER" description="FlowMVI Lazy Plugin" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="kotlinFunctionName()" defaultValue="" alwaysStopAt="true" />
     <variable name="PluginName" expression="capitalize(NAME)" defaultValue="" alwaysStopAt="false" />
-    <context />
+    <context>
+      <option name="KOTLIN_CLASS" value="true" />
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
   </template>
   <template name="fmvim" value="internal sealed interface $NAME$State : MVIState {&#10;    data object Loading : $NAME$State&#10;    data class Error(val e: Exception?) : $NAME$State&#10;    $END$&#10;}&#10;&#10;internal sealed interface $NAME$Intent : MVIIntent {&#10;&#10;}&#10;&#10;internal sealed interface $NAME$Action : MVIAction {&#10;&#10;}" shortcut="ENTER" description="FlowMVI Model definition" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="camelCase(String)" defaultValue="" alwaysStopAt="true" />
-    <context />
+    <context>
+      <option name="KOTLIN_CLASS" value="true" />
+      <option name="KOTLIN_OBJECT_DECLARATION" value="true" />
+      <option name="KOTLIN_TOPLEVEL" value="true" />
+    </context>
   </template>
-  <template name="fmvid" value="/**&#10; * TODO: Document the decorator&#10; */&#10;@FlowMVIDSL&#10;fun &lt;S : MVIState, I : MVIIntent, A : MVIAction&gt; $NAME$Decorator(&#10;    name: String? = &quot;$DecoratorName$Decorator&quot;,&#10;) = decorator&lt;S, I, A&gt; {&#10;    this.name = name&#10;    $END$&#10;}&#10;&#10;/**&#10; * Installs a new [$NAME$Decorator].&#10; */&#10;@FlowMVIDSL&#10;fun &lt;S : MVIState, I : MVIIntent, A : MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$DecoratorName$Decorator&quot;,&#10;) = install($NAME$Decorator(name))&#10;" shortcut="ENTER" description="Create a new Decorator" toReformat="true" toShortenFQNames="true">
+  <template name="fmvid" value="/**&#10; * TODO: Document the decorator&#10; */&#10;@FlowMVIDSL&#10;fun &lt;S : MVIState, I : MVIIntent, A : MVIAction&gt; $NAME$Decorator(&#10;    name: String? = &quot;$DecoratorName$Decorator&quot;,&#10;) = decorator&lt;S, I, A&gt; {&#10;    this.name = name&#10;    $END$&#10;}&#10;&#10;/**&#10; * Installs a new [$NAME$Decorator].&#10; */&#10;@FlowMVIDSL&#10;fun &lt;S : MVIState, I : MVIIntent, A : MVIAction&gt; StoreBuilder&lt;S, I, A&gt;.$NAME$(&#10;    name: String? = &quot;$DecoratorName$Decorator&quot;,&#10;) = install($NAME$Decorator(name))&#10;" shortcut="ENTER" description="FlowMVI Decorator" toReformat="true" toShortenFQNames="true">
     <variable name="NAME" expression="kotlinFunctionName()" defaultValue="" alwaysStopAt="true" />
     <variable name="DecoratorName" expression="capitalize(NAME)" defaultValue="" alwaysStopAt="false" />
     <context>
-      <option name="KOTLIN_TOPLEVEL" value="true" />
+      <option name="KOTLIN_CLASS" value="true" />
     </context>
   </template>
 </templateSet>
\ No newline at end of file

From ba4d1f34c6c7efdfd0859f02459962fc50136f0f Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 18:49:28 +0100
Subject: [PATCH 2/7] chore: bump version

---
 buildSrc/src/main/kotlin/Config.kt | 2 +-
 metrics/build.gradle.kts           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 11f3b33a..d6fb4d6d 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -20,7 +20,7 @@ object Config {
     const val majorRelease = 3
     const val minorRelease = 1
     const val patch = 0
-    const val postfix = "-beta06" // include dash (-)
+    const val postfix = "" // include dash (-)
     const val versionCode = 9
 
     const val majorVersionName = "$majorRelease.$minorRelease.$patch"
diff --git a/metrics/build.gradle.kts b/metrics/build.gradle.kts
index 0e70684e..29332c13 100644
--- a/metrics/build.gradle.kts
+++ b/metrics/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
     id(libs.plugins.kotlin.multiplatform.id)
     id(libs.plugins.androidLibrary.id)
     alias(libs.plugins.atomicfu)
-    alias(libs.plugins.maven.publish)
-    dokkaDocumentation
+    // alias(libs.plugins.maven.publish)
+    // dokkaDocumentation
 }
 
 kotlin {

From 4c604cba825be057341bb5aa4ae2571bfcaaf055 Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 18:57:15 +0100
Subject: [PATCH 3/7] chore: bump deps

---
 .github/workflows/docs.yml               |  2 --
 .github/workflows/publish.yml            |  1 -
 gradle/libs.versions.toml                | 34 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  |  3 +--
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 31ea529e..faa859c6 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -53,14 +53,12 @@ jobs:
 
       - name: Generate docs
         run: ./gradlew dokkaGenerate
-        continue-on-error: true
 
       - name: Make javadoc dir
         run: mkdir -p ./docs/javadocs
 
       - name: Move docs to the parent docs dir
         run: cp -r ./build/dokka/html ./docs/javadocs/
-        continue-on-error: true
 
       - name: Create sample app distributable
         run: ./gradlew wasmJsBrowserDistribution --no-configuration-cache
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8f19a220..b98b2255 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -82,7 +82,6 @@ jobs:
 
       - name: Publish new plugin version
         run: ./gradlew debugger:ideplugin:publishPlugin --no-configuration-cache
-        continue-on-error: true # TODO: Remove once verified works
         env:
           CHANGELOG: ${{steps.build_changelog.outputs.changelog}}
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c613cd3d..6582f956 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,38 +1,38 @@
 [versions]
-activity = "1.10.0-beta01"
+activity = "1.10.0-rc01"
 # @pin
 #noinspection GradleDependency - must match jb-lifecycle
 androidx-lifecycle = "2.8.7"
-compose = "1.7.1"
+compose = "1.7.3"
 composeDetektPlugin = "1.4.0"
 core-ktx = "1.13.1"
-coroutines = "1.9.0"
+coroutines = "1.10.1"
 datetime = "0.6.1"
-dependencyAnalysisPlugin = "2.5.0"
+dependencyAnalysisPlugin = "2.6.1"
 detekt = "1.23.7"
-dokka = "2.0.0-Beta"
-essenty = "2.3.0"
+dokka = "2.0.0"
+essenty = "2.4.0"
 fragment = "1.8.5"
-gradleAndroid = "8.8.0-rc01"
+gradleAndroid = "8.8.0-rc02"
 gradleDoctorPlugin = "0.10.0"
-intellij-ide-plugin = "2.1.0"
+intellij-ide-plugin = "2.2.1"
 intellij-idea = "2024.1"
+jmh = "1.37"
 junit = "4.13.2"
 kotest = "6.0.0.M1"
-jmh = "1.37"
 # @pin
 kotlin = "2.1.0"
-kotlin-collections = "0.3.8"
+kotlin-benchmark = "0.4.13"
 kotlin-browser = "0.3"
+kotlin-collections = "0.3.8"
 kotlin-io = "0.6.0"
 kotlinx-atomicfu = "0.26.1"
-ktor = "3.0.2"
+ktor = "3.0.3"
 lifecycle = "2.8.4"
 maven-publish-plugin = "0.30.0"
-serialization = "1.7.3"
+serialization = "1.8.0-RC"
 turbine = "1.2.0"
 versionCatalogUpdatePlugin = "0.8.5"
-kotlin-benchmark = "0.4.13"
 
 [libraries]
 android-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradleAndroid" }
@@ -55,6 +55,7 @@ kotest-framework = { module = "io.kotest:kotest-framework-engine", version.ref =
 kotest-junit = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
 kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" }
 kotlin-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinx-atomicfu" }
+kotlin-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlin-benchmark" }
 kotlin-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser", version.ref = "kotlin-browser" }
 kotlin-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlin-collections" }
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -69,7 +70,6 @@ kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-c
 kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
-kotlin-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlin-benchmark" }
 ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" }
 ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
@@ -145,9 +145,9 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 gradleDoctor = { id = "com.osacky.doctor", version.ref = "gradleDoctorPlugin" }
 intellij-ide = { id = "org.jetbrains.intellij.platform", version.ref = "intellij-ide-plugin" }
 kotest = { id = "io.kotest.multiplatform", version.ref = "kotest" }
-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish-plugin" }
+kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "maven-publish-plugin" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdatePlugin" }
-kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c82..cea7a793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

From 58e6a8d2a460bfcd1ce06c260d8e4c7ae223e03a Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 19:24:15 +0100
Subject: [PATCH 4/7] fix: fix wide screen display on sample app

---
 .../arch/configuration/TestConfigurationFactory.kt   |  3 ++-
 .../sample/features/decompose/DecomposeScreen.kt     |  3 ++-
 .../sample/features/diconfig/DIConfigScreen.kt       |  3 ++-
 .../flowmvi/sample/features/home/HomeScreen.kt       |  3 ++-
 .../respawn/flowmvi/sample/features/lce/LCEScreen.kt |  4 +++-
 .../flowmvi/sample/features/logging/LoggingScreen.kt |  5 +++--
 .../sample/features/savedstate/SavedStateScreen.kt   |  3 ++-
 .../flowmvi/sample/features/simple/SimpleScreen.kt   |  3 ++-
 .../sample/features/undoredo/UndoRedoScreen.kt       |  6 +++---
 .../respawn/flowmvi/sample/ui/widgets/CodeView.kt    | 12 ++++++++----
 10 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/arch/configuration/TestConfigurationFactory.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/arch/configuration/TestConfigurationFactory.kt
index f3f75840..61b298e6 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/arch/configuration/TestConfigurationFactory.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/arch/configuration/TestConfigurationFactory.kt
@@ -5,6 +5,7 @@ import kotlinx.serialization.KSerializer
 import pro.respawn.flowmvi.api.MVIAction
 import pro.respawn.flowmvi.api.MVIIntent
 import pro.respawn.flowmvi.api.MVIState
+import pro.respawn.flowmvi.api.StateStrategy.Immediate
 import pro.respawn.flowmvi.dsl.StoreBuilder
 import pro.respawn.flowmvi.plugins.enableLogging
 import pro.respawn.flowmvi.savedstate.api.Saver
@@ -20,7 +21,7 @@ object TestConfigurationFactory : ConfigurationFactory {
             this.name = name
             debuggable = true
             parallelIntents = false
-            atomicStateUpdates = false
+            stateStrategy = Immediate
             onOverflow = SUSPEND
         }
         enableLogging()
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/decompose/DecomposeScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/decompose/DecomposeScreen.kt
index d4ae3c7f..8f596948 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/decompose/DecomposeScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/decompose/DecomposeScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
@@ -157,7 +158,7 @@ private fun DecomposeScreenContent(
         ) {
             Text(
                 text = Description.formatAsMultiline(),
-                modifier = Modifier.padding(horizontal = 12.dp)
+                modifier = Modifier.padding(horizontal = 12.dp).widthIn(max = 600.dp)
             )
 
             ChildPages(
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/diconfig/DIConfigScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/diconfig/DIConfigScreen.kt
index 4bc85f86..27b086ba 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/diconfig/DIConfigScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/diconfig/DIConfigScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -100,7 +101,7 @@ private fun DiConfigScreenContent(state: PersistedCounterState) = Column(
     horizontalAlignment = Alignment.CenterHorizontally,
     verticalArrangement = Arrangement.Top,
 ) {
-    Text(Description.formatAsMultiline())
+    Text(Description.formatAsMultiline(), modifier = Modifier.widthIn(max = 600.dp))
     Spacer(Modifier.height(12.dp))
     Text("Persisted counter state: ${state.counter}")
     Spacer(Modifier.height(12.dp))
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/home/HomeScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/home/HomeScreen.kt
index 666d1cad..cf2babae 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/home/HomeScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/home/HomeScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -119,7 +120,7 @@ private fun IntentReceiver<HomeIntent>.HomeScreenContent(
             Text(
                 text = BuildFlags.ProjectDescription,
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(horizontal = 12.dp)
+                modifier = Modifier.padding(horizontal = 12.dp).widthIn(max = 400.dp)
             )
             Spacer(Modifier.height(12.dp))
             HomeFeature.entries.forEachIndexed { i, item ->
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/lce/LCEScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/lce/LCEScreen.kt
index 10a00ca3..658fc84d 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/lce/LCEScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/lce/LCEScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
@@ -110,13 +111,14 @@ private fun IntentReceiver<LCEIntent>.LCEScreenContent(
         is LCEState.Content -> Box {
             LazyColumn(
                 contentPadding = WindowInsets.verticalListPaddings(),
+                horizontalAlignment = Alignment.CenterHorizontally,
                 modifier = Modifier
                     .padding(horizontal = 12.dp)
                     .fillMaxWidth()
             ) {
                 item {
                     Column(modifier = Modifier) {
-                        Text(Description.formatAsMultiline())
+                        Text(Description.formatAsMultiline(), modifier = Modifier.widthIn(max = 600.dp))
                         Spacer(Modifier.height(12.dp))
                         CodeText(Code)
                         Spacer(Modifier.height(12.dp))
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/logging/LoggingScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/logging/LoggingScreen.kt
index b3941ba2..9edb5d3c 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/logging/LoggingScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/logging/LoggingScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
@@ -120,7 +121,7 @@ private fun IntentReceiver<LoggingIntent>.LoggingScreenContent(
                     horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier.padding(horizontal = 12.dp),
                 ) {
-                    Text(Description.formatAsMultiline())
+                    Text(Description.formatAsMultiline(), modifier = Modifier.widthIn(max = 600.dp))
                     Spacer(Modifier.height(12.dp))
                     CodeText(Code)
                     Spacer(Modifier.height(12.dp))
@@ -136,7 +137,7 @@ private fun IntentReceiver<LoggingIntent>.LoggingScreenContent(
                     text = it,
                     modifier = Modifier
                         .padding(horizontal = 12.dp, vertical = 4.dp)
-                        .fillMaxWidth(),
+                        .widthIn(max = 600.dp),
                     fontSize = 13.sp,
                     fontFamily = FontFamily.Monospace,
                 )
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/savedstate/SavedStateScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/savedstate/SavedStateScreen.kt
index 3700a59a..f8c08d00 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/savedstate/SavedStateScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/savedstate/SavedStateScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -100,7 +101,7 @@ private fun IntentReceiver<SavedStateIntent>.SavedStateScreenContent(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
         ) {
-            Text(Description.formatAsMultiline())
+            Text(Description.formatAsMultiline(), modifier = Modifier.widthIn(max = 600.dp))
             Spacer(Modifier.height(24.dp))
             RTextInput(
                 input = input,
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
index 8162b29d..7f0856eb 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -84,7 +85,7 @@ private fun IntentReceiver<SimpleIntent>.SimpleScreenContent(
 ) = Column(
     modifier = Modifier
         .fillMaxHeight()
-        .fillMaxWidth()
+        .widthIn(max = 600.dp)
         .padding(horizontal = 12.dp)
         .verticalScroll(rememberScrollState()),
     verticalArrangement = Arrangement.Center,
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/undoredo/UndoRedoScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/undoredo/UndoRedoScreen.kt
index ace612ae..ea279d6c 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/undoredo/UndoRedoScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/undoredo/UndoRedoScreen.kt
@@ -120,10 +120,10 @@ private fun IntentReceiver<UndoRedoIntent>.UndoRedoScreenContent(
     horizontalAlignment = Alignment.CenterHorizontally,
     verticalArrangement = Arrangement.Center,
 ) {
-    Text(Description.formatAsMultiline())
+    Text(Description.formatAsMultiline(), modifier = Modifier.widthIn(max = 600.dp))
     Spacer(Modifier.height(12.dp))
     Row(
-        modifier = Modifier.widthIn(min = 400.dp),
+        modifier = Modifier.widthIn(min = 400.dp, max = 600.dp),
         horizontalArrangement = Arrangement.End,
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -143,7 +143,7 @@ private fun IntentReceiver<UndoRedoIntent>.UndoRedoScreenContent(
     RTextInput(
         input = state.input,
         onTextChange = { intent(ChangedInput(it)) },
-        modifier = Modifier.fillMaxWidth().widthIn(max = 400.dp),
+        modifier = Modifier.widthIn(max = 600.dp),
         label = "Type and undo",
     )
     Spacer(Modifier.height(12.dp))
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/ui/widgets/CodeView.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/ui/widgets/CodeView.kt
index 317399c2..9d424509 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/ui/widgets/CodeView.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/ui/widgets/CodeView.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.Text
@@ -22,6 +23,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import dev.snipme.highlights.Highlights
 import dev.snipme.highlights.model.BoldHighlight
@@ -31,6 +33,7 @@ import dev.snipme.highlights.model.SyntaxLanguage
 import dev.snipme.highlights.model.SyntaxThemes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import pro.respawn.flowmvi.sample.ui.theme.Monaspace
 
 val Highlights.annotatedString
     get() = buildAnnotatedString {
@@ -82,13 +85,14 @@ fun CodeText(
         SelectionContainer {
             Text(
                 text = string,
-                fontSize = 13.sp,
-                fontFamily = FontFamily.Monospace, // TODO: Monaspace appears to be unsupported by compose?
+                fontSize = 14.sp,
+                fontFamily = FontFamily.Monaspace,
                 textAlign = TextAlign.Start,
                 overflow = TextOverflow.Visible,
+                fontWeight = FontWeight.W500,
                 softWrap = false,
-                lineHeight = 16.sp,
-                modifier = Modifier.fillMaxWidth(),
+                lineHeight = 20.sp,
+                modifier = Modifier.widthIn(min = 400.dp).fillMaxWidth(),
             )
         }
     }

From f84da3e99f998122c7c22cd521d000a3f4a2da83 Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 19:36:52 +0100
Subject: [PATCH 5/7] docs: update readme and quickstart

---
 README.md                                     | 23 +++++++------------
 .../pro/respawn/flowmvi/dsl/StoreDsl.kt       |  4 ----
 docs/CONTRIBUTING.md                          |  2 +-
 docs/quickstart.md                            | 20 +++++++++-------
 .../sample/features/simple/SimpleScreen.kt    |  1 -
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 09cf002e..23157cd3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 ![GitHub last commit](https://img.shields.io/github/last-commit/respawn-app/FlowMVI)
 ![Issues](https://img.shields.io/github/issues/respawn-app/FlowMVI)
 ![GitHub top language](https://img.shields.io/github/languages/top/respawn-app/flowMVI)
-[![CodeFactor](https://www.codefactor.io/repository/github/respawn-app/flowMVI/badge)](https://www.codefactor.io/repository/github/respawn-app/flowMVI)
 [![AndroidWeekly #563](https://androidweekly.net/issues/issue-563/badge)](https://androidweekly.net/issues/issue-563/)
 [![Slack channel](https://img.shields.io/badge/Chat-Slack-orange.svg?style=flat&logo=slack)](https://kotlinlang.slack.com/messages/flowmvi/)
 
@@ -122,12 +121,12 @@ All you have to do is:
 
 ```kotlin
 sealed interface State : MVIState {
+    
     data object Loading : State
     data class Error(val e: Exception) : State
     data class Content(val counter: Int = 0) : State
 }
 
-
 sealed interface Intent : MVIIntent {
     data object ClickedCounter : Intent
 }
@@ -141,25 +140,19 @@ sealed interface Action : MVIAction {
 
 ```kotlin
 val counterStore = store(initial = State.Loading, scope = coroutineScope) {
+    
+    install(analyticsPlugin) // install plugins you need
 
-    // install plugins you need
-    install(analyticsPlugin)
-
-    // recover from errors
-    recover { e: Exception ->
+    recover { e: Exception -> // recover from errors
         updateState { State.Error(e) }
         null
     }
-
-    // load data
-    init {
+    init { // load data
         updateState {
             State.Content(counter = repository.loadCounter())
         }
     }
-
-    // respond to events
-    reduce { intent: Intent ->
+    reduce { intent: Intent -> // respond to events
         when (intent) {
             is ClickedCounter -> updateState<State.Content, _> {
                 action(ShowMessage("Incremented!"))
@@ -320,7 +313,7 @@ Enjoy testable UI and free `@Preview`s.
 
 ### Android Support
 
-No more subclassing `ViewModel`. Use generic `StoreViewModel` instead and make your business logic multiplatform.
+No more subclassing `ViewModel`. Use `StoreViewModel` instead and make your business logic multiplatform.
 
 ```kotlin
 val module = module { // Koin example
@@ -412,7 +405,7 @@ Begin by reading the [Quickstart Guide](https://opensource.respawn.pro/FlowMVI/#
 ## License
 
 ```
-   Copyright 2022-2024 Respawn Team and contributors
+   Copyright 2022-2025 Respawn Team and contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/core/src/commonMain/kotlin/pro/respawn/flowmvi/dsl/StoreDsl.kt b/core/src/commonMain/kotlin/pro/respawn/flowmvi/dsl/StoreDsl.kt
index eed203b1..39dce6f5 100644
--- a/core/src/commonMain/kotlin/pro/respawn/flowmvi/dsl/StoreDsl.kt
+++ b/core/src/commonMain/kotlin/pro/respawn/flowmvi/dsl/StoreDsl.kt
@@ -3,7 +3,6 @@ package pro.respawn.flowmvi.dsl
 import kotlinx.coroutines.CoroutineScope
 import pro.respawn.flowmvi.api.ActionShareBehavior
 import pro.respawn.flowmvi.api.FlowMVIDSL
-import pro.respawn.flowmvi.api.ImmutableStore
 import pro.respawn.flowmvi.api.MVIAction
 import pro.respawn.flowmvi.api.MVIIntent
 import pro.respawn.flowmvi.api.MVIState
@@ -107,6 +106,3 @@ public inline fun <S : MVIState, I : MVIIntent, A : MVIAction> lazyStore(
     mode: LazyThreadSafetyMode = LazyThreadSafetyMode.SYNCHRONIZED,
     @BuilderInference crossinline configure: BuildStore<S, I, A>,
 ): Lazy<Store<S, I, A>> = lazy(mode) { store(initial, configure).apply { start(scope) } }
-
-public inline val <S : MVIState, I : MVIIntent, A : MVIAction> Store<S, I, A>.immutable: ImmutableStore<S, I, A>
-    get() = this
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index e23b553a..b7a787e8 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -12,7 +12,7 @@
     release=false
     ```
 * Make sure you have these installed:
-    * Android Studio latest Canary or Beta, depending on the current project's AGP (yes, we're on the edge).
+    * Android Studio latest Stable or Beta, depending on the current project's AGP.
     * Kotlin Multiplatform suite (run `kdoctor` to verify proper setup)
     * Detekt plugin
     * Kotest plugin
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 89da8527..87e1596a 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -20,7 +20,7 @@ First of all, here's how the library works:
 
 ![Maven Central](https://img.shields.io/maven-central/v/pro.respawn.flowmvi/core?label=Maven%20Central)
 
-<details open>
+<details>
 <summary>Version catalogs</summary>
 
 ```toml
@@ -308,7 +308,7 @@ configure {
     actionShareBehavior = ActionShareBehavior.Distribute()
     onOverflow = BufferOverflow.DROP_OLDEST
     intentCapacity = Channel.UNLIMITED
-    atomicStateUpdates = true
+    stateStrategy = StateStrategy.Atomic(reentrant = true)
     allowIdleSubscriptions = false
     logger = if (debuggable) PlatformStoreLogger else NoOpStoreLogger
     verifyPlugins = debuggable
@@ -343,12 +343,16 @@ configure {
     * `Channel.CONFLATED` - A buffer of 1
     * `Channel.RENDEZVOUS` - Zero buffer (all events not ready to be processed are dropped)
     * `Channel.BUFFERED` - Default system buffer capacity
-* `atomicStateUpdates` - Enables transaction serialization for state updates, making state updates atomic and
-  suspendable. Synchronizes state updates, allowing only **one** client to read and/or update the state at a time. All
-  other clients that attempt to get the state will wait in a FIFO queue and suspend the parent coroutine. For one-time
-  usage of non-atomic updates, see `updateStateImmediate`. Learn
-  more [here](https://proandroiddev.com/how-to-safely-update-state-in-your-kotlin-apps-bf51ccebe2ef).
-  Has a small performance impact because of coroutine context switching and mutex usage when enabled.
+* `stateStrategy` - Strategy for serializing state transactions. Choose one of the following:
+    * `Atomic(reentrant = false)` - Enables transaction serialization for state updates, making state updates atomic and
+      suspendable. Synchronizes state updates, allowing only **one** client to read and/or update the state at a time.
+      All other clients that attempt to get the state will wait in a FIFO queue and suspend the parent coroutine. For
+      one-time usage of non-atomic updates, see `updateStateImmediate`. Recommended for most cases.
+    * `Atomic(reentrant = true)` - Same as above, but allows nested state updates
+      without causing a deadlock, like this: `updateState { updateState { } }`. This strategy is 15x slower than other
+      options, but still negligible for managing UI and other non-performance-critical tasks. This is the default.
+    * `Immediate` - 2 times faster than atomic with no reentrancy, but provides no state consistency guarantees
+      and no thread-safety. Equivalent to always using `updateStateImmediate`.
 * `allowIdleSubscriptions` - A flag to indicate that clients may subscribe to this store even while it is not started.
   If you intend to stop and restart your store while the subscribers are present, set this to `true`. By default, will
   use the opposite value of the `debuggable` parameter (`true` on production).
diff --git a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
index 7f0856eb..94ac9701 100644
--- a/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
+++ b/sample/src/commonMain/kotlin/pro/respawn/flowmvi/sample/features/simple/SimpleScreen.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding

From b092b5fffc4ba6998ae3e55c905d95ed408833a2 Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 19:44:58 +0100
Subject: [PATCH 6/7] docs: remove dokka workaround

---
 buildSrc/src/main/kotlin/dokkaDocumentation.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/dokkaDocumentation.gradle.kts b/buildSrc/src/main/kotlin/dokkaDocumentation.gradle.kts
index 22e642a5..22f04595 100644
--- a/buildSrc/src/main/kotlin/dokkaDocumentation.gradle.kts
+++ b/buildSrc/src/main/kotlin/dokkaDocumentation.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 val libs by versionCatalog
 
 dokka {
-    dokkaEngineVersion.set("1.9.20")
     dokkaGeneratorIsolation = ClassLoaderIsolation()
     moduleName = project.name
     moduleVersion = project.version.toString()

From f5fb170f02489a15573e5b6bafcf8f870254b81f Mon Sep 17 00:00:00 2001
From: Nek-12 <vaizin.nikita@gmail.com>
Date: Mon, 23 Dec 2024 19:57:20 +0100
Subject: [PATCH 7/7] docs: fix dokka root config

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 51cb96ef..c1e85485 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,7 +28,7 @@ plugins {
     // alias(libs.plugins.androidLibrary) apply false
     // alias(libs.plugins.kotlin.multiplatform) apply false
     // alias(libs.plugins.kotlinMultiplatform) apply false
-    id(libs.plugins.dokka.id)
+    dokkaDocumentation
 }
 
 allprojects {