Merge pull request #135 from arkivanov/stable-dsl

Promoted DSL APIs to stable
arkivanov · Apr 27, 2024 · 1350f82 · 1350f82
2 parents 5073f2f + 2a9c81a
commit 1350f82
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 38 deletions.
diff --git a/...mmonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperDsl.kt b/...mmonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperDsl.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
 import com.arkivanov.mvikotlin.core.store.Bootstrapper
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.internal.atomic
 import com.arkivanov.mvikotlin.core.utils.internal.initialize
 import com.arkivanov.mvikotlin.core.utils.internal.requireValue
@@ -16,7 +15,6 @@ import kotlin.coroutines.CoroutineContext
  * @param mainContext main [CoroutineContext] to be used by default when launching coroutines, default value is [Dispatchers.Main].
  * @param handler invoked when the [Bootstrapper] is invoked by the [Store][com.arkivanov.mvikotlin.core.store.Store].
  */
-@ExperimentalMviKotlinApi
 fun <Action : Any> coroutineBootstrapper(
     mainContext: CoroutineContext = Dispatchers.Main,
     handler: CoroutineBootstrapperScope<Action>.() -> Unit,
@@ -27,7 +25,6 @@ fun <Action : Any> coroutineBootstrapper(
         }
     }
 
-@ExperimentalMviKotlinApi
 private abstract class AbstractBootstrapper<Action : Any>(
     private val scope: CoroutineScope,
 ) : Bootstrapper<Action>, CoroutineBootstrapperScope<Action>, CoroutineScope by scope {

diff --git a/...onMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperScope.kt b/...onMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperScope.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
 import com.arkivanov.mvikotlin.core.annotations.MainThread
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import kotlinx.coroutines.CoroutineScope
 
 /**
@@ -12,7 +11,6 @@ import kotlinx.coroutines.CoroutineScope
  *
  * @see coroutineBootstrapper
  */
-@ExperimentalMviKotlinApi
 interface CoroutineBootstrapperScope<in Action : Any> : CoroutineScope {
 
     /**

diff --git a/...c/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorDsl.kt b/...c/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorDsl.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
 import com.arkivanov.mvikotlin.core.store.Executor
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.internal.atomic
 import com.arkivanov.mvikotlin.core.utils.internal.initialize
 import com.arkivanov.mvikotlin.core.utils.internal.requireValue
@@ -16,7 +15,6 @@ import kotlin.coroutines.CoroutineContext
  * @param mainContext main [CoroutineContext] to be used by default when launching coroutines, default value is [Dispatchers.Main].
  * @param block configures the [Executor], called for every new instance.
  */
-@ExperimentalMviKotlinApi
 fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> coroutineExecutorFactory(
     mainContext: CoroutineContext = Dispatchers.Main,
     block: ExecutorBuilder<Intent, Action, State, Message, Label>.() -> Unit,
@@ -28,7 +26,6 @@ fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> corout
         )
     }
 
-@ExperimentalMviKotlinApi
 private fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> executor(
     mainContext: CoroutineContext,
     block: ExecutorBuilder<Intent, Action, State, Message, Label>.() -> Unit,
@@ -43,7 +40,6 @@ private fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any
     )
 }
 
-@ExperimentalMviKotlinApi
 @CoroutineExecutorDslMaker
 class ExecutorBuilder<Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> internal constructor() {
 
@@ -90,7 +86,6 @@ class ExecutorBuilder<Intent : Any, Action : Any, State : Any, Message : Any, La
     }
 }
 
-@ExperimentalMviKotlinApi
 private class ExecutorImpl<in Intent : Any, Action : Any, State : Any, Message : Any, Label : Any>(
     private val scope: CoroutineScope,
     private val intentHandlers: List<CoroutineExecutorScope<State, Message, Action, Label>.(Intent) -> Boolean>,

diff --git a/...commonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorScope.kt b/...commonMain/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorScope.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
 import com.arkivanov.mvikotlin.core.annotations.MainThread
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import kotlinx.coroutines.CoroutineScope
 
 /**
@@ -12,7 +11,6 @@ import kotlinx.coroutines.CoroutineScope
  *
  * @see coroutineExecutorFactory
  */
-@ExperimentalMviKotlinApi
 @CoroutineExecutorDslMaker
 interface CoroutineExecutorScope<out State : Any, in Message : Any, in Action : Any, in Label : Any> : CoroutineScope {
 

diff --git a/...Test/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperDslTest.kt b/...Test/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineBootstrapperDslTest.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -9,7 +8,6 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalMviKotlinApi::class)
 @Suppress("TestFunctionName")
 class CoroutineBootstrapperDslTest {
 

diff --git a/...mmonTest/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorDslTest.kt b/...mmonTest/kotlin/com/arkivanov/mvikotlin/extensions/coroutines/CoroutineExecutorDslTest.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.coroutines
 
 import com.arkivanov.mvikotlin.core.test.internal.DefaultExecutorCallbacks
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -12,7 +11,6 @@ import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 @Suppress("TestFunctionName")
-@OptIn(ExperimentalMviKotlinApi::class)
 class CoroutineExecutorDslTest {
 
     @Test

diff --git a/.../commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperDsl.kt b/.../commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperDsl.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.reaktive
 
 import com.arkivanov.mvikotlin.core.store.Bootstrapper
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.internal.atomic
 import com.arkivanov.mvikotlin.core.utils.internal.initialize
 import com.arkivanov.mvikotlin.core.utils.internal.requireValue
@@ -12,15 +11,13 @@ import com.badoo.reaktive.disposable.scope.DisposableScope
  *
  * @param handler invoked when the [Bootstrapper] is invoked by the [Store][com.arkivanov.mvikotlin.core.store.Store].
  */
-@ExperimentalMviKotlinApi
 fun <Action : Any> reaktiveBootstrapper(handler: ReaktiveBootstrapperScope<Action>.() -> Unit): Bootstrapper<Action> =
     object : AbstractBootstrapper<Action>() {
         override fun invoke() {
             handler()
         }
     }
 
-@ExperimentalMviKotlinApi
 private abstract class AbstractBootstrapper<Action : Any>(
     private val scope: DisposableScope = DisposableScope(),
 ) : Bootstrapper<Action>, ReaktiveBootstrapperScope<Action>, DisposableScope by scope {

diff --git a/...ommonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperScope.kt b/...ommonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperScope.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvikotlin.extensions.reaktive
 
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.badoo.reaktive.disposable.scope.DisposableScope
 
 /**
@@ -11,7 +10,6 @@ import com.badoo.reaktive.disposable.scope.DisposableScope
  *
  * @see reaktiveBootstrapper
  */
-@ExperimentalMviKotlinApi
 interface ReaktiveBootstrapperScope<in Action : Any> : DisposableScope {
 
     /**

diff --git a/.../src/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorDsl.kt b/.../src/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorDsl.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.reaktive
 
 import com.arkivanov.mvikotlin.core.store.Executor
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.internal.atomic
 import com.arkivanov.mvikotlin.core.utils.internal.initialize
 import com.arkivanov.mvikotlin.core.utils.internal.requireValue
@@ -12,15 +11,13 @@ import com.badoo.reaktive.disposable.scope.DisposableScope
  *
  * @param block configures the [Executor], called for every new instance.
  */
-@ExperimentalMviKotlinApi
 fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> reaktiveExecutorFactory(
     block: ExecutorBuilder<Intent, Action, State, Message, Label>.() -> Unit,
 ): () -> Executor<Intent, Action, State, Message, Label> =
     {
         executor(block)
     }
 
-@ExperimentalMviKotlinApi
 private fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> executor(
     block: ExecutorBuilder<Intent, Action, State, Message, Label>.() -> Unit,
 ): Executor<Intent, Action, State, Message, Label> {
@@ -33,7 +30,6 @@ private fun <Intent : Any, Action : Any, State : Any, Message : Any, Label : Any
     )
 }
 
-@ExperimentalMviKotlinApi
 @ReaktiveExecutorDslMaker
 class ExecutorBuilder<Intent : Any, Action : Any, State : Any, Message : Any, Label : Any> internal constructor() {
 
@@ -80,7 +76,6 @@ class ExecutorBuilder<Intent : Any, Action : Any, State : Any, Message : Any, La
     }
 }
 
-@ExperimentalMviKotlinApi
 private class ExecutorImpl<in Intent : Any, Action : Any, State : Any, Message : Any, Label : Any>(
     private val intentHandlers: List<ReaktiveExecutorScope<State, Message, Action, Label>.(Intent) -> Boolean>,
     private val actionHandlers: List<ReaktiveExecutorScope<State, Message, Action, Label>.(Action) -> Boolean>,

diff --git a/...rc/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorScope.kt b/...rc/commonMain/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorScope.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvikotlin.extensions.reaktive
 
 import com.arkivanov.mvikotlin.core.annotations.MainThread
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.badoo.reaktive.disposable.scope.DisposableScope
 
 /**
@@ -12,7 +11,6 @@ import com.badoo.reaktive.disposable.scope.DisposableScope
  *
  * @see reaktiveExecutorFactory
  */
-@ExperimentalMviKotlinApi
 @ReaktiveExecutorDslMaker
 interface ReaktiveExecutorScope<out State : Any, in Message : Any, in Action : Any, in Label : Any> : DisposableScope {
 

diff --git a/...monTest/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperDslTest.kt b/...monTest/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveBootstrapperDslTest.kt
@@ -1,14 +1,12 @@
 package com.arkivanov.mvikotlin.extensions.reaktive
 
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.badoo.reaktive.test.base.hasSubscribers
 import com.badoo.reaktive.test.observable.TestObservable
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-@OptIn(ExperimentalMviKotlinApi::class)
 @Suppress("TestFunctionName")
 class ReaktiveBootstrapperDslTest {
 

diff --git a/.../commonTest/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorDslTest.kt b/.../commonTest/kotlin/com/arkivanov/mvikotlin/extensions/reaktive/ReaktiveExecutorDslTest.kt
@@ -2,7 +2,6 @@ package com.arkivanov.mvikotlin.extensions.reaktive
 
 import com.arkivanov.mvikotlin.core.store.Executor
 import com.arkivanov.mvikotlin.core.test.internal.DefaultExecutorCallbacks
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.badoo.reaktive.test.base.hasSubscribers
 import com.badoo.reaktive.test.observable.TestObservable
 import kotlin.test.Test
@@ -11,7 +10,6 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNull
 
 @Suppress("TestFunctionName")
-@OptIn(ExperimentalMviKotlinApi::class)
 class ReaktiveExecutorDslTest {
 
     @Test

diff --git a/...lin/com/arkivanov/mvikotlin/sample/coroutines/shared/details/store/DetailsStoreFactory.kt b/...lin/com/arkivanov/mvikotlin/sample/coroutines/shared/details/store/DetailsStoreFactory.kt
@@ -1,11 +1,8 @@
-@file:OptIn(ExperimentalMviKotlinApi::class)
-
 package com.arkivanov.mvikotlin.sample.coroutines.shared.details.store
 
 import com.arkivanov.mvikotlin.core.store.SimpleBootstrapper
 import com.arkivanov.mvikotlin.core.store.Store
 import com.arkivanov.mvikotlin.core.store.StoreFactory
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.JvmSerializable
 import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutorScope
 import com.arkivanov.mvikotlin.extensions.coroutines.coroutineExecutorFactory

diff --git a/...otlin/com/arkivanov/mvikotlin/sample/reaktive/shared/details/store/DetailsStoreFactory.kt b/...otlin/com/arkivanov/mvikotlin/sample/reaktive/shared/details/store/DetailsStoreFactory.kt
@@ -1,11 +1,8 @@
-@file:OptIn(ExperimentalMviKotlinApi::class)
-
 package com.arkivanov.mvikotlin.sample.reaktive.shared.details.store
 
 import com.arkivanov.mvikotlin.core.store.SimpleBootstrapper
 import com.arkivanov.mvikotlin.core.store.Store
 import com.arkivanov.mvikotlin.core.store.StoreFactory
-import com.arkivanov.mvikotlin.core.utils.ExperimentalMviKotlinApi
 import com.arkivanov.mvikotlin.core.utils.JvmSerializable
 import com.arkivanov.mvikotlin.extensions.reaktive.ReaktiveExecutorScope
 import com.arkivanov.mvikotlin.extensions.reaktive.reaktiveExecutorFactory