launchInCurrentThread

CHANGELOG.md

@@ -1,30 +1,9 @@
 # Changelog
 
-## 0.16.6
-
-* `Startup`:
-    * `Launcher`:
-        * Improvements in `StartLauncherPlugin#start` methods
-        * Add opportunity to pass second argument on `JVM` platform as log level
-* `Repos`:
-    * `Ktor`:
-        * `Client`:
-            * All clients repos got opportunity to customize their flows
-    * `Exposed`:
-        * Extensions `eqOrIsNull` and `neqOrIsNotNull` for `Column`
-
-## 0.16.5
-
-* `Versions`:
-    * `Ktor`: `2.2.1` -> `2.2.2`
-
-## 0.16.4
-
-* `Coroutines`:
-    * Create `launchInCurrentThread`
-
 ## 0.16.3
 
+* `Coroutines`:
+    * Create `launchInCurrentThread`
 * `Startup`:
     * `Launcher`:
         * All starting API have been moved into `StartLauncherPlugin` and do not require serialize/deserialize cycle for now

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.16.6
-android_code_version=174
+version=0.16.3
+android_code_version=171

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ jb-dokka = "1.7.20"
 klock = "3.4.0"
 uuid = "0.6.0"
 
-ktor = "2.2.2"
+ktor = "2.2.1"
 
 gh-release = "2.4.1"
 

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/NewFlowsWebsockets.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.isActive
  * connection. Must return true in case if must be reconnected. By default always reconnecting
  */
 @Warning("This feature is internal and should not be used directly. It is can be changed without any notification and warranty on compile-time or other guaranties")
-inline fun <T : Any> openBaseWebSocketFlow(
+inline fun <reified T : Any> openBaseWebSocketFlow(
     noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
     noinline webSocketSessionRequest: suspend SendChannel<T>.() -> Unit
 ): Flow<T> {
@@ -57,7 +57,7 @@ inline fun <reified T : Any> HttpClient.openWebSocketFlow(
 ): Flow<T> {
     pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
 
-    return openBaseWebSocketFlow(checkReconnection) {
+    return openBaseWebSocketFlow<T>(checkReconnection) {
         val block: suspend DefaultClientWebSocketSession.() -> Unit = {
             while (isActive) {
                 send(receiveDeserialized<T>())

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ColumnEqOrNull.kt

@@ -1,23 +0,0 @@
-package dev.inmo.micro_utils.repos.exposed
-
-import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNotNull
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
-
-fun <T> Column<T?>.eqOrIsNull(
-    value: T?
-) = if (value == null) {
-    isNull()
-} else {
-    eq(value)
-}
-
-fun <T> Column<T?>.neqOrIsNotNull(
-    value: T?
-) = if (value == null) {
-    isNotNull()
-} else {
-    neq(value)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorCRUDRepoClient.kt

@@ -1,17 +1,12 @@
 package dev.inmo.micro_utils.repos.ktor.client.crud
 
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.common.crud.deletedObjectsIdsFlowRouting
-import dev.inmo.micro_utils.repos.ktor.common.crud.newObjectsFlowRouting
-import dev.inmo.micro_utils.repos.ktor.common.crud.updatedObjectsFlowRouting
 import io.ktor.client.HttpClient
 import io.ktor.http.ContentType
 import io.ktor.util.reflect.TypeInfo
 import io.ktor.util.reflect.typeInfo
-import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.*
 
 class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
@@ -26,15 +21,6 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
             baseUrl: String,
             httpClient: HttpClient,
             contentType: ContentType,
-            newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, newObjectsFlowRouting),
-            ),
-            updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-            ),
-            deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-            ),
             noinline idSerializer: suspend (IdType) -> String
         ) = KtorCRUDRepoClient(
             KtorReadCRUDRepoClient(
@@ -49,10 +35,7 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
             KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
                 baseUrl,
                 httpClient,
-                contentType,
-                newObjectsFlow,
-                updatedObjectsFlow,
-                deletedObjectsIdsFlow
+                contentType
             )
         )
 
@@ -61,23 +44,11 @@ class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
             subpart: String,
             httpClient: HttpClient,
             contentType: ContentType,
-            newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, newObjectsFlowRouting),
-            ),
-            updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-            ),
-            deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-            ),
             noinline idSerializer: suspend (IdType) -> String
         ) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
             buildStandardUrl(baseUrl, subpart),
             httpClient,
             contentType,
-            newObjectsFlow,
-            updatedObjectsFlow,
-            deletedObjectsIdsFlow,
             idSerializer
         )
     }
@@ -109,23 +80,11 @@ inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepo
     subpart: String,
     httpClient: HttpClient,
     contentType: ContentType,
-    newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, newObjectsFlowRouting),
-    ),
-    updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-    ),
-    deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-    ),
     noinline idSerializer: suspend (IdType) -> String
 ) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
     buildStandardUrl(baseUrl, subpart),
     httpClient,
     contentType,
-    newObjectsFlow,
-    updatedObjectsFlow,
-    deletedObjectsIdsFlow,
     idSerializer
 )
 

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorWriteCrudRepoClient.kt

@@ -53,22 +53,19 @@ class KtorWriteCrudRepoClient<ObjectType, IdType, InputValue> (
         inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
             baseUrl: String,
             httpClient: HttpClient,
-            contentType: ContentType,
-            newObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, newObjectsFlowRouting),
-            ),
-            updatedObjectsFlow: Flow<ObjectType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-            ),
-            deletedObjectsIdsFlow: Flow<IdType> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-            ),
+            contentType: ContentType
         ) = KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
             baseUrl,
             httpClient,
-            newObjectsFlow,
-            updatedObjectsFlow,
-            deletedObjectsIdsFlow,
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, newObjectsFlowRouting),
+            ),
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
+            ),
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
+            ),
             {
                 contentType(contentType)
                 setBody(it)

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/value/KtorKeyValueRepoClient.kt

@@ -1,14 +1,10 @@
 package dev.inmo.micro_utils.repos.ktor.client.key.value
 
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.common.key_value.onNewValueRoute
-import dev.inmo.micro_utils.repos.ktor.common.key_value.onValueRemovedRoute
 import io.ktor.client.HttpClient
 import io.ktor.http.ContentType
 import io.ktor.http.encodeURLQueryComponent
-import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.*
 
 class KtorKeyValueRepoClient<Key, Value> (
@@ -24,12 +20,6 @@ class KtorKeyValueRepoClient<Key, Value> (
             httpClient: HttpClient,
             contentType: ContentType,
             noinline idSerializer: suspend (Key) -> String,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
             noinline valueSerializer: suspend (Value) -> String
         ) = KtorKeyValueRepoClient(
             KtorReadKeyValueRepoClient(
@@ -38,9 +28,7 @@ class KtorKeyValueRepoClient<Key, Value> (
             KtorWriteKeyValueRepoClient(
                 baseUrl,
                 httpClient,
-                contentType,
-                onNewValue,
-                onValueRemoved
+                contentType
             )
         )
         inline operator fun <reified Key, reified Value> invoke(
@@ -49,20 +37,12 @@ class KtorKeyValueRepoClient<Key, Value> (
             httpClient: HttpClient,
             contentType: ContentType,
             noinline idSerializer: suspend (Key) -> String,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
             noinline valueSerializer: suspend (Value) -> String
         ) = KtorKeyValueRepoClient(
             buildStandardUrl(baseUrl, subpart),
             httpClient,
             contentType,
             idSerializer,
-            onNewValue,
-            onValueRemoved,
             valueSerializer
         )
     }

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/value/KtorWriteKeyValueRepoClient.kt

@@ -60,19 +60,17 @@ class KtorWriteKeyValueRepoClient<Key, Value>(
         inline operator fun <reified Key, reified Value> invoke(
             baseUrl: String,
             httpClient: HttpClient,
-            contentType: ContentType,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
+            contentType: ContentType
         ) = KtorWriteKeyValueRepoClient<Key, Value>(
             baseUrl,
             httpClient,
             contentType,
-            onNewValue,
-            onValueRemoved,
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, onNewValueRoute),
+            ),
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, onValueRemovedRoute),
+            ),
             typeInfo<List<Key>>(),
             typeInfo<List<Value>>(),
             typeInfo<Map<Key, Value>>()

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/values/KtorKeyValuesRepoClient.kt

@@ -1,15 +1,10 @@
 package dev.inmo.micro_utils.repos.ktor.client.key.values
 
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onDataClearedRoute
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onNewValueRoute
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.onValueRemovedRoute
 import io.ktor.client.HttpClient
 import io.ktor.http.ContentType
 import io.ktor.http.encodeURLQueryComponent
-import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.*
 
 class KtorKeyValuesRepoClient<Key, Value> (
@@ -25,15 +20,6 @@ class KtorKeyValuesRepoClient<Key, Value> (
             httpClient: HttpClient,
             contentType: ContentType,
             noinline keySerializer: suspend (Key) -> String,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onDataClearedRoute),
-            ),
             noinline valueSerializer: suspend (Value) -> String
         ) = KtorKeyValuesRepoClient(
             KtorReadKeyValuesRepoClient(
@@ -46,10 +32,7 @@ class KtorKeyValuesRepoClient<Key, Value> (
             KtorWriteKeyValuesRepoClient(
                 baseUrl,
                 httpClient,
-                contentType,
-                onNewValue,
-                onValueRemoved,
-                onDataCleared
+                contentType
             )
         )
         inline operator fun <reified Key : Any, reified Value : Any> invoke(
@@ -58,24 +41,12 @@ class KtorKeyValuesRepoClient<Key, Value> (
             httpClient: HttpClient,
             contentType: ContentType,
             noinline keySerializer: suspend (Key) -> String,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onDataClearedRoute),
-            ),
             noinline valueSerializer: suspend (Value) -> String
         ) = KtorKeyValuesRepoClient(
             buildStandardUrl(baseUrl, subpart),
             httpClient,
             contentType,
             keySerializer,
-            onNewValue,
-            onValueRemoved,
-            onDataCleared,
             valueSerializer
         )
     }
@@ -88,25 +59,13 @@ inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
     keySerializer: SerializationStrategy<Key>,
     valueSerializer: SerializationStrategy<Value>,
     serialFormat: StringFormat,
-    onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onNewValueRoute),
-    ),
-    onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onValueRemovedRoute),
-    ),
-    onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onDataClearedRoute),
-    ),
 ) = KtorKeyValuesRepoClient<Key, Value>(
     baseUrl,
     httpClient,
     contentType,
     {
         serialFormat.encodeToString(keySerializer, it).encodeURLQueryComponent()
-    },
-    onNewValue,
-    onValueRemoved,
-    onDataCleared
+    }
 ) {
     serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
 }
@@ -118,25 +77,13 @@ inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
     keySerializer: SerializationStrategy<Key>,
     valueSerializer: SerializationStrategy<Value>,
     serialFormat: BinaryFormat,
-    onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onNewValueRoute),
-    ),
-    onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onValueRemovedRoute),
-    ),
-    onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
-        buildStandardUrl(baseUrl, onDataClearedRoute),
-    ),
 ) = KtorKeyValuesRepoClient<Key, Value>(
     baseUrl,
     httpClient,
     contentType,
     {
         serialFormat.encodeHex(keySerializer, it)
-    },
-    onNewValue,
-    onValueRemoved,
-    onDataCleared
+    }
 ) {
     serialFormat.encodeHex(valueSerializer, it)
 }

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/values/KtorWriteKeyValuesRepoClient.kt

@@ -84,23 +84,20 @@ class KtorWriteKeyValuesRepoClient<Key : Any, Value : Any>(
         inline operator fun <reified Key : Any, reified Value : Any> invoke(
             baseUrl: String,
             httpClient: HttpClient,
-            contentType: ContentType,
-            onNewValue: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            onValueRemoved: Flow<Pair<Key, Value>> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            onDataCleared: Flow<Key> = httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onDataClearedRoute),
-            ),
+            contentType: ContentType
         ) = KtorWriteKeyValuesRepoClient<Key, Value>(
             baseUrl,
             httpClient,
             contentType,
-            onNewValue,
-            onValueRemoved,
-            onDataCleared,
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, onNewValueRoute),
+            ),
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, onValueRemovedRoute),
+            ),
+            httpClient.createStandardWebsocketFlow(
+                buildStandardUrl(baseUrl, onDataClearedRoute),
+            ),
             typeInfo<Key>(),
             typeInfo<Value>(),
             typeInfo<Map<Key, List<Value>>>()

startup/launcher/src/commonMain/kotlin/StartLauncherPlugin.kt

@@ -14,7 +14,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialFormat
 import kotlinx.serialization.StringFormat
 import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.jsonObject
 import org.koin.core.Koin
 import org.koin.core.KoinApplication
@@ -94,19 +93,18 @@ object StartLauncherPlugin : StartPlugin {
 
     /**
      * Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
-     * plugin. It is basic [start] method which accepts both [config] and [rawConfig] which suppose to be the same or
-     * at least [rawConfig] must contain serialized variant of [config]
+     * plugin
      *
      * @param rawConfig It is expected that this [JsonObject] will contain serialized [Config] ([StartLauncherPlugin] will
      * deserialize it in its [StartLauncherPlugin.setupDI]
      */
-    suspend fun start(config: Config, rawConfig: JsonObject) {
+    suspend fun start(rawConfig: JsonObject) {
 
         logger.i("Start initialization")
         val koinApp = KoinApplication.init()
         koinApp.modules(
             module {
-                setupDI(config, rawConfig)
+                setupDI(rawConfig)
             }
         )
         logger.i("Modules loaded")
@@ -118,26 +116,26 @@ object StartLauncherPlugin : StartPlugin {
     }
 
     /**
-     * Call [start] with deserialized [Config] as config and [rawConfig] as is
+     * Will create [KoinApplication], init, load modules using [StartLauncherPlugin] and start plugins using the same base
+     * plugin
      *
-     * @param rawConfig It is expected that this [JsonObject] will contain serialized [Config]
-     */
-    suspend fun start(rawConfig: JsonObject) {
-
-        start(defaultJson.decodeFromJsonElement(Config.serializer(), rawConfig), rawConfig)
-
-    }
-
-    /**
-     * Call [start] with deserialized [Config] as is and serialize it to [JsonObject] to pass as the first parameter
-     * to the basic [start] method
-     *
-     * @param config Will be converted to [JsonObject] as raw config. That means that all plugins from [config] will
-     * receive serialized version of [config] in [StartPlugin.setupDI] method
+     * @param config In difference with other [start] method here config is already deserialized and this config will
+     * be converted to [JsonObject] as raw config. That means that all plugins from [config] will receive
+     * serialized version of [config] in [StartPlugin.setupDI] method
      */
     suspend fun start(config: Config) {
 
-        start(config, defaultJson.encodeToJsonElement(Config.serializer(), config).jsonObject)
+        logger.i("Start initialization")
+        val koinApp = KoinApplication.init()
+        logger.i("Koin app created")
+        koinApp.modules(
+            module {
+                setupDI(config)
+            }
+        )
+        startKoin(koinApp)
+        logger.i("Koin started")
+        startPlugin(koinApp.koin)
 
     }
 }

startup/launcher/src/jvmMain/kotlin/Main.kt

@@ -1,7 +1,6 @@
 package dev.inmo.micro_utils.startup.launcher
 
 import dev.inmo.kslog.common.KSLog
-import dev.inmo.kslog.common.LogLevel
 import dev.inmo.kslog.common.i
 import kotlinx.serialization.json.jsonObject
 import java.io.File
@@ -24,25 +23,10 @@ import java.io.File
  * In that case in `build/distributions` folder you will be able to find zip and tar files with all required
  * tools for application running (via their `bin/app_name` binary). In that case yoy will not need to pass
  * `--args=...` and launch will look like `./bin/app_name sample.config.json`
- *
- * ## Debug mode
- *
- * You may pass the second parameter, one of [LogLevel] enum variants to setup [KSLog] minimal logging level. Sample:
- *
- * ```bash
- * ./gradlew run --args="sample.config.json DEBUG" // enable debugging output
- * ```
- *
- * OR
- * ```bash
- * ./gradlew run --args="sample.config.json WARNING" // enable logging since WARNING
- * ```
- *
- * **Default level is [LogLevel.INFO]**
  */
 suspend fun main(args: Array<String>) {
 
-    KSLog.default = KSLog("Launcher", args.getOrNull(1) ?.let { LogLevel.valueOf(it) } ?: LogLevel.INFO)
+    KSLog.default = KSLog("Launcher")
     val (configPath) = args
     val file = File(configPath)
     KSLog.i("Start read config from ${file.absolutePath}")

startup/template/README.md

@@ -1,10 +0,0 @@
-# How to use
-
-In case you have multiplatform project and wish to use startup plugin, this template may help you to create new modules.
-
-1. Copy-paste whole template folder (you may clone this folder to your project and actualize some data to copy your prepared template)
-2. Replace `group_name` by your project (or root module) group name
-3. Replace `module_name` by the name of your new module name
-
-You may read about the `build.gradle` structure in these templates in project
-[KotlinMultiplatformProjectTemplate](https://github.com/InsanusMokrassar/KotlinMultiplatformProjectTemplate).

startup/template/client/build.gradle

@@ -1,18 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-    alias(libs.plugins.compose)
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api project(":${rootProject.name}.module_name.common")
-            }
-        }
-    }
-}

startup/template/client/src/commonMain/kotlin/ClientPlugin.kt

@@ -1,15 +0,0 @@
-package group_name.module_name.client
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ClientPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-    }
-}

startup/template/client/src/jsMain/kotlin/ClientJSPlugin.kt

@@ -1,20 +0,0 @@
-package group_name.module_name.client
-
-import group_name.module_name.common.CommonJSPlugin
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ClientJSPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with(CommonJSPlugin) { setupDI(config) }
-        with(ClientPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonJSPlugin.startPlugin(koin)
-        ClientPlugin.startPlugin(koin)
-    }
-}

startup/template/client/src/jsMain/kotlin/JSModuleLoader.kt

@@ -1,9 +0,0 @@
-package group_name.module_name.client
-
-import dev.inmo.micro_utils.startup.plugin.createStartupPluginAndRegister
-
-@ExperimentalStdlibApi
-@EagerInitialization
-@JsExport
-@ExperimentalJsExport
-private val jsModuleLoader = createStartupPluginAndRegister("template.ClientJSPlugin") { ClientJSPlugin }

startup/template/client/src/jvmMain/kotlin/ClientJVMPlugin.kt

@@ -1,21 +0,0 @@
-package group_name.module_name.client
-
-import group_name.module_name.common.CommonJVMPlugin
-import group_name.module_name.common.CommonJVMPlugin.setupDI
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ClientJVMPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with(CommonJVMPlugin) { setupDI(config) }
-        with(ClientPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonJVMPlugin.startPlugin(koin)
-        ClientPlugin.startPlugin(koin)
-    }
-}

startup/template/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="group_name.module_name.client"/>

startup/template/client/src/main/kotlin/ClientAndroidPlugin.kt

@@ -1,21 +0,0 @@
-package group_name.module_name.client
-
-import group_name.module_name.common.CommonAndroidPlugin
-import group_name.module_name.common.CommonAndroidPlugin.setupDI
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ClientAndroidPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with(CommonAndroidPlugin) { setupDI(config) }
-        with(ClientPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonAndroidPlugin.startPlugin(koin)
-        ClientPlugin.startPlugin(koin)
-    }
-}

startup/template/common/build.gradle

@@ -1,7 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.android.library"
-}
-
-apply from: "$mppProjectWithSerializationPresetPath"

startup/template/common/src/commonMain/kotlin/CommonPlugin.kt

@@ -1,11 +0,0 @@
-package group_name.module_name.common
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.module.Module
-
-object CommonPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-
-    }
-}

startup/template/common/src/commonMain/kotlin/Constants.kt

@@ -1 +0,0 @@
-package group_name.module_name.common

startup/template/common/src/jsMain/kotlin/CommonJSPlugin.kt

@@ -1,17 +0,0 @@
-package group_name.module_name.common
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object CommonJSPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with (CommonPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonPlugin.startPlugin(koin)
-    }
-}

startup/template/common/src/jsMain/kotlin/JSModuleLoader.kt

@@ -1,9 +0,0 @@
-package group_name.module_name.common
-
-import dev.inmo.micro_utils.startup.plugin.createStartupPluginAndRegister
-
-@ExperimentalStdlibApi
-@EagerInitialization
-@JsExport
-@ExperimentalJsExport
-private val jsModuleLoader = createStartupPluginAndRegister("template.CommonJSPlugin") { CommonJSPlugin }

startup/template/common/src/jvmMain/kotlin/CommonJVMPlugin.kt

@@ -1,17 +0,0 @@
-package group_name.module_name.common
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object CommonJVMPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with (CommonPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonPlugin.startPlugin(koin)
-    }
-}

startup/template/common/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="group_name.module_name.common"/>

startup/template/common/src/main/kotlin/CommonAndroidPlugin.kt

@@ -1,17 +0,0 @@
-package group_name.module_name.common
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object CommonAndroidPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with (CommonPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonPlugin.startPlugin(koin)
-    }
-}

startup/template/server/build.gradle

@@ -1,16 +0,0 @@
-plugins {
-    id "org.jetbrains.kotlin.multiplatform"
-    id "org.jetbrains.kotlin.plugin.serialization"
-}
-
-apply from: "$mppJavaProjectPresetPath"
-
-kotlin {
-    sourceSets {
-        commonMain {
-            dependencies {
-                api project(":${rootProject.name}.module_name.common")
-            }
-        }
-    }
-}

startup/template/server/src/commonMain/kotlin/ServerPlugin.kt

@@ -1,15 +0,0 @@
-package group_name.module_name.server
-
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ServerPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-    }
-}

startup/template/server/src/jvmMain/kotlin/ServerJVMPlugin.kt

@@ -1,20 +0,0 @@
-package group_name.module_name.server
-
-import group_name.module_name.common.CommonJVMPlugin
-import dev.inmo.micro_utils.startup.plugin.StartPlugin
-import kotlinx.serialization.json.JsonObject
-import org.koin.core.Koin
-import org.koin.core.module.Module
-
-object ServerJVMPlugin : StartPlugin {
-    override fun Module.setupDI(config: JsonObject) {
-        with(CommonJVMPlugin) { setupDI(config) }
-        with(ServerPlugin) { setupDI(config) }
-    }
-
-    override suspend fun startPlugin(koin: Koin) {
-        super.startPlugin(koin)
-        CommonJVMPlugin.startPlugin(koin)
-        ServerPlugin.startPlugin(koin)
-    }
-}