we need to create a new CoroutineScope if the old one was cancelled

1gravity · Sep 11, 2022 · 2c48b24 · 2c48b24
1 parent 2cac924
commit 2c48b24
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -27,13 +27,13 @@ Note, this readme offers a quick overview of the framework. For more in-depth in
 ```kotlin
 dependencies {
     // the core library
-    implementation("com.1gravity:bloc-core:0.6.1")
+    implementation("com.1gravity:bloc-core:0.6.2")
 
     // add to use the framework together with Redux
-    implementation("com.1gravity:bloc-redux:0.6.1")
+    implementation("com.1gravity:bloc-redux:0.6.2")
 
     // useful extensions for Android and Jetpack/JetBrains Compose
-    implementation("com.1gravity:bloc-compose:0.6.1")
+    implementation("com.1gravity:bloc-compose:0.6.2")
 }
 ```
 

diff --git a/bloc-core/src/commonMain/kotlin/com/onegravity/bloc/internal/BlocImpl.kt b/bloc-core/src/commonMain/kotlin/com/onegravity/bloc/internal/BlocImpl.kt
@@ -93,9 +93,9 @@ internal class BlocImpl<State : Any, Action : Any, SideEffect : Any, Proposal :
         BlocObserver<State>?, sideEffect:
         BlocObserver<SideEffect>?
     ) {
-        val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
-
         observerLifecycle.doOnStart {
+            val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
             logger.d("start Bloc subscription")
             state?.let {
                 coroutineScope.launch {
@@ -107,11 +107,11 @@ internal class BlocImpl<State : Any, Action : Any, SideEffect : Any, Proposal :
                     sideEffects.collect { sideEffect(it) }
                 }
             }
-        }
 
-        observerLifecycle.doOnStop {
-            logger.d("stop Bloc subscription")
-            coroutineScope.cancel("stop Bloc subscription")
+            observerLifecycle.doOnStop {
+                logger.d("stop Bloc subscription")
+                coroutineScope.cancel("stop Bloc subscription")
+            }
         }
     }
 

diff --git a/bloc-core/src/commonMain/kotlin/com/onegravity/bloc/utils/Subscriptions.kt b/bloc-core/src/commonMain/kotlin/com/onegravity/bloc/utils/Subscriptions.kt
@@ -23,11 +23,11 @@ public fun <State : Any, Action : Any, SideEffect : Any> Bloc<State, Action, Sid
     state: (suspend (state: State) -> Unit)? = null,
     sideEffect: (suspend (sideEffect: SideEffect) -> Unit)? = null
 ) {
-    val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
-
     lifecycle.doOnStart {
         logger.d("start Bloc subscription")
 
+        val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
         state?.let {
             coroutineScope.launch {
                 collect { state(it) }
@@ -39,11 +39,11 @@ public fun <State : Any, Action : Any, SideEffect : Any> Bloc<State, Action, Sid
                 sideEffects.collect { sideEffect(it) }
             }
         }
-    }
 
-    lifecycle.doOnStop {
-        logger.d("stop Bloc subscription")
-        coroutineScope.cancel("stop Bloc subscription")
+        lifecycle.doOnStop {
+            logger.d("stop Bloc subscription")
+            coroutineScope.cancel("stop Bloc subscription")
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -25,7 +25,7 @@ kotlin.internal.mpp.hierarchicalStructureByDefault=true
 
 # Maven
 POM_GROUP=com.1gravity
-POM_VERSION_NAME=0.6.1
+POM_VERSION_NAME=0.6.2
 # set PUBLISH_AS_SNAPSHOT to false to publish a release version
 PUBLISH_AS_SNAPSHOT=true
 

diff --git a/versions.properties b/versions.properties
@@ -65,13 +65,13 @@ version.androidx.recyclerview=1.2.1
 ##                # available=1.3.0-beta02
 
 ## unused
-version.com.1gravity..bloc-compose=0.6.1
+version.com.1gravity..bloc-compose=0.6.2
 
 ## unused
-version.com.1gravity..bloc-redux=0.6.1
+version.com.1gravity..bloc-redux=0.6.2
 
 ## unused
-version.com.1gravity..bloc-core=0.6.1
+version.com.1gravity..bloc-core=0.6.2
 
 version.com.1gravity..redux-kotlin-threadsafe=0.5.10
 

diff --git a/website/docs/getting_started/setup.md b/website/docs/getting_started/setup.md
@@ -12,12 +12,12 @@ hide_title: true
 ```kotlin
 dependencies {
     // the core library
-    implementation("com.1gravity:bloc-core:0.6.1")
+    implementation("com.1gravity:bloc-core:0.6.2")
 
     // add to use the framework together with Redux
-    implementation("com.1gravity:bloc-redux:0.6.1")
+    implementation("com.1gravity:bloc-redux:0.6.2")
 
     // useful extensions for Android and Jetpack/JetBrains Compose
-    implementation("com.1gravity:bloc-compose:0.6.1")
+    implementation("com.1gravity:bloc-compose:0.6.2")
 }
 ```