remove expicit KSLog dependency

7.3.0

.github/workflows/build.yml

@@ -8,9 +8,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew build

CHANGELOG.md

@@ -1,6 +1,120 @@
 # Changelog
 
-## 5.0.0
+## 7.3.0
+
+* `Versions`:
+  * `Kotlin`: `1.9.21`
+  * `Serialization`: `1.6.1`
+  * `tgbotapi`: `9.4.1`
+  * `ktor`: `2.3.6`
+  * `KSLog`: Removed explicit dependency, now it is declared in tgbotapi
+  * `MicroUtils`: `0.20.15`
+
+## 7.2.3
+
+* `Versions`:
+  * `tgbotapi`: `9.2.2`
+  * `exposed`: `0.44.0`
+  * `koin`: `3.5.0`
+  * `ktor`: `2.3.5`
+
+## 7.2.2
+
+* `Bot`:
+  * Now you may customize both `onStart` and `onUpdate` conflicts resolvers
+
+## 7.2.1
+
+* `Versions`:
+  * `tgbotapi`: `9.2.1`
+  * `ktor`: `2.3.4`
+
+## 7.2.0
+
+* `Version`:
+  * `tgbotapi`: `9.2.0`
+  * `kslog`: `1.1.2`
+  * `sqlite`: `3.43.0.0`
+
+## 7.1.0
+
+* `Version`:
+  * `microutils`: `0.19.9`
+  * `tgbotapi`: `9.1.0`
+  * `ktor`: `2.3.3`
+  * `coroutines`: `1.7.3`
+  * `koin`: `3.4.3`
+
+## 7.0.0
+
+* `Version`:
+  * `microutils`: `0.19.7`
+  * `tgbotapi`: `9.0.0`
+  * `ktor`: `2.3.2`
+  * `coroutines`: `1.7.2`
+
+## 6.1.0
+
+* `Version`:
+  * `kotlin`: `1.8.22`
+  * `microutils`: `0.19.4`
+  * `tgbotapi`: `8.1.0`
+  * `koin`: `3.4.2`
+  * `sqlite`: `3.42.0.0`
+
+## 6.0.1
+
+* `Version`:
+  * `microutils`: `0.19.2`
+  * `tgbotapi`: `8.0.1`
+  * `uuid`: `0.7.1`
+  * `ktor`: `2.3.1`
+  * `koin`: `3.4.1`
+
+## 6.0.0
+
+* `Versions`:
+  * `microutils`: `0.19.1`
+  * `tgbotapi`: `8.0.0`
+  * `klock`: `4.0.3`
+
+## 5.1.3
+
+* `Versions`:
+  * `serialization`: `1.5.1`
+  * `microutils`: `0.18.4`
+  * `tgbotapi`: `7.1.3`
+
+## 5.1.2
+
+* `Versions`:
+  * `microutils`: `0.18.1`
+  * `tgbotapi`: `7.1.2`
+
+## 5.1.1
+
+* `Versions`:
+    * `kotlin`: `1.8.21`
+    * `microutils`: `0.18.0`
+    * `tgbotapi`: `7.1.1`
+
+## 5.1.0
+
+* `Versions`:
+  * `tgbotapi`: `7.1.0`
+  * `sqlite`: `3.41.2.1`
+
+## 5.0.2
+
+* `Versions`:
+  * `kotlin`: `1.8.20`
+  * `microutils`: `0.17.8`
+  * `tgbotapi`: `7.0.2`
+  * `kslog`: `1.1.1`
+  * `ktor`: `2.3.0`
+  * `koin`: `3.4.0`
+
+## 5.0.1
 
 * `Versions`:
   * `tgbotapi`: `7.0.1`

bot/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'org.jetbrains.kotlin.jvm'
     id "org.jetbrains.kotlin.plugin.serialization"
     id 'application'
+    id "com.google.devtools.ksp"
 }
 
 project.group="$group"
@@ -18,7 +19,7 @@ dependencies {
     api libs.tgbotapi
     api libs.tgbotapi.behaviourBuilder.fsm
     api libs.microutils.repos.exposed
-    api libs.kslog
+    api libs.microutils.koin
 
     api libs.sqlite
 
@@ -32,7 +33,10 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+ksp { // this generator do not require any arguments and we should left `ksp` empty
 }
 

bot/publish.gradle

@@ -2,11 +2,11 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 publishing {
@@ -96,4 +96,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }

bot/src/main/kotlin/dev/inmo/plagubot/OnStartContextsConflictResolver.kt

@@ -0,0 +1,16 @@
+package dev.inmo.plagubot
+
+import dev.inmo.micro_utils.fsm.common.State
+
+fun interface OnStartContextsConflictResolver {
+    /**
+     * @param old Old state which is currently placed on the [State.context]
+     * @param new New state pretend to replace [old] one
+     * @return Should return:
+     *
+     * * Null in case when current realization unable to resolve conflict
+     * * False when current realization knows that [new] [State] must **not** replace [old] one
+     * * True when current realization knows that [new] [State] must replace [old] one
+     */
+    suspend operator fun invoke(old: State, new: State): Boolean?
+}

bot/src/main/kotlin/dev/inmo/plagubot/OnUpdateContextsConflictResolver.kt

@@ -0,0 +1,20 @@
+package dev.inmo.plagubot
+
+import dev.inmo.micro_utils.fsm.common.State
+
+fun interface OnUpdateContextsConflictResolver {
+    /**
+     * This method will be called when [sourceStateWithOldContext] [State.context] and [newStateWithNewContext] are not equal and currently there is
+     * launched [currentStateOnNewContext] state on the chain with [State.context] from [currentStateOnNewContext]
+     *
+     * @param sourceStateWithOldContext Old state where from [newStateWithNewContext] came
+     * @param newStateWithNewContext New state with changing [State.context] (it is different with [sourceStateWithOldContext] [State.context])
+     * @param currentStateOnNewContext State which is currently running on [newStateWithNewContext] [State.context]
+     * @return Should return:
+     *
+     * * Null in case when current realization unable to resolve conflict
+     * * False when [currentStateOnNewContext] **should not** be stopped in favor to [newStateWithNewContext]
+     * * True when [currentStateOnNewContext] **should** be stopped in favor to [newStateWithNewContext]
+     */
+    suspend operator fun invoke(sourceStateWithOldContext: State, newStateWithNewContext: State, currentStateOnNewContext: State): Boolean?
+}

bot/src/main/kotlin/dev/inmo/plagubot/PlaguBot.kt

@@ -6,6 +6,7 @@ import dev.inmo.micro_utils.coroutines.runCatchingSafely
 import dev.inmo.micro_utils.fsm.common.State
 import dev.inmo.micro_utils.fsm.common.StatesManager
 import dev.inmo.micro_utils.fsm.common.managers.*
+import dev.inmo.micro_utils.koin.getAllDistinct
 import dev.inmo.plagubot.config.*
 import dev.inmo.tgbotapi.bot.ktor.telegramBot
 import dev.inmo.tgbotapi.extensions.api.webhook.deleteWebhook
@@ -94,6 +95,8 @@ data class PlaguBot(
         GlobalContext.startKoin(koinApp)
         logger.i("Koin started")
         lateinit var behaviourContext: BehaviourContext
+        val onStartContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnStartContextsConflictResolver>() }
+        val onUpdateContextsConflictResolver by lazy { koinApp.koin.getAllDistinct<OnUpdateContextsConflictResolver>() }
         bot.buildBehaviourWithFSM(
             scope = scope,
             defaultExceptionsHandler = {
@@ -101,7 +104,8 @@ data class PlaguBot(
             },
             statesManager = koinApp.koin.getOrNull<StatesManager<State>>() ?: DefaultStatesManager(
                 koinApp.koin.getOrNull<DefaultStatesManagerRepo<State>>() ?: InMemoryDefaultStatesManagerRepo<State>(),
-                onStartContextsConflictResolver = { _, _ -> false }
+                onStartContextsConflictResolver = { old, new -> onStartContextsConflictResolver.firstNotNullOfOrNull { it(old, new) } ?: false },
+                onUpdateContextsConflictResolver = { old, new, currentNew -> onUpdateContextsConflictResolver.firstNotNullOfOrNull { it(old, new, currentNew) } ?: false }
             ),
             onStateHandlingErrorHandler = koinApp.koin.getOrNull<StateHandlingErrorHandler<State>>() ?: { state, e ->
                 logger.eS(e) { "Unable to handle state $state" }

build.gradle

@@ -8,6 +8,7 @@ buildscript {
         classpath libs.buildscript.kt.gradle
         classpath libs.buildscript.kt.serialization
         classpath libs.buildscript.gh.release
+        classpath libs.buildscript.ksp
     }
 }
 

gradle.properties

@@ -5,4 +5,4 @@ kotlin.js.generate.externals=true
 kotlin.incremental=true
 
 group=dev.inmo
-version=5.0.1
+version=7.4.0

gradle/libs.versions.toml

@@ -1,26 +1,27 @@
 [versions]
 
-kt = "1.8.10"
+kt = "1.9.21"
-kt-serialization = "1.5.0"
+kt-serialization = "1.6.1"
-kt-coroutines = "1.6.4"
+kt-coroutines = "1.7.3"
 
-microutils = "0.17.5"
+microutils = "0.20.15"
-tgbotapi = "7.0.1"
+tgbotapi = "9.4.1"
-kslog = "1.0.0"
 
-jb-exposed = "0.41.1"
+ksp = "1.9.20-1.0.14"
-jb-dokka = "1.8.10"
 
-sqlite = "3.40.0.0"
+jb-exposed = "0.44.1"
+jb-dokka = "1.9.10"
 
-klock = "3.4.0"
+sqlite = "3.43.0.0"
-uuid = "0.7.0"
 
-ktor = "2.2.4"
+klock = "4.0.10"
+uuid = "0.8.1"
+
+ktor = "2.3.6"
 
 gh-release = "2.4.1"
 
-koin = "3.3.2"
+koin = "3.5.0"
 
 [libraries]
 
@@ -32,7 +33,8 @@ kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json"
 tgbotapi = { module = "dev.inmo:tgbotapi", version.ref = "tgbotapi" }
 tgbotapi-behaviourBuilder-fsm = { module = "dev.inmo:tgbotapi.behaviour_builder.fsm", version.ref = "tgbotapi" }
 microutils-repos-exposed = { module = "dev.inmo:micro_utils.repos.exposed", version.ref = "microutils" }
-kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
+microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
+microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
 
 koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 
@@ -48,3 +50,4 @@ buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",
 buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
 buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" }
 buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
+buildscript-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/build.gradle

@@ -19,6 +19,6 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
 }

plugin/publish.gradle

@@ -2,11 +2,11 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier = 'sources'
 }
 
 publishing {
@@ -96,4 +96,27 @@ if (project.hasProperty("signing.gnupg.keyName")) {
             dependsOn(it)
         }
     }
+
+    // Workaround to make android sign operations depend on signing tasks
+    project.getTasks().withType(AbstractPublishToMaven.class).configureEach {
+        def signingTasks = project.getTasks().withType(Sign.class)
+        mustRunAfter(signingTasks)
+    }
+    // Workaround to make test tasks use sign
+    project.getTasks().withType(Sign.class).configureEach { signTask ->
+        def withoutSign = (signTask.name.startsWith("sign") ? signTask.name.minus("sign") : signTask.name)
+        def pubName = withoutSign.endsWith("Publication") ? withoutSign.substring(0, withoutSign.length() - "Publication".length()) : withoutSign
+        // These tasks only exist for native targets, hence findByName() to avoid trying to find them for other targets
+
+        // Task ':linkDebugTest<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def debugTestTask = tasks.findByName("linkDebugTest$pubName")
+        if (debugTestTask != null) {
+            signTask.mustRunAfter(debugTestTask)
+        }
+        // Task ':compileTestKotlin<platform>' uses this output of task ':sign<platform>Publication' without declaring an explicit or implicit dependency
+        def testTask = tasks.findByName("compileTestKotlin$pubName")
+        if (testTask != null) {
+            signTask.mustRunAfter(testTask)
+        }
+    }
 }