mirror of
https://github.com/InsanusMokrassar/PlaguBot.git
synced 2025-12-05 22:06:02 +00:00
Compare commits
137 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 91f77e7bed | |||
| ea3273c4cf | |||
| 439972e783 | |||
| 08907291c5 | |||
| 0f4819a83d | |||
| 7abdf18491 | |||
| 98a91ea357 | |||
| 934f603a8a | |||
| 76e9cdae8d | |||
| fbe166f2b4 | |||
| 30cf190461 | |||
| 9d72d79321 | |||
| 33057dd2cb | |||
| e1bb8e9799 | |||
| fd5e979f11 | |||
| 20e1f042f1 | |||
| 0e65a425c3 | |||
| 517ab1e1a4 | |||
| 977cf32669 | |||
| 5bd1916fb5 | |||
| 8c22b418f8 | |||
| 3663f987bc | |||
| 93d15af80d | |||
| 27c5f379a4 | |||
| ae7a7b84ac | |||
| 5b98aef237 | |||
| 3755972394 | |||
| 5d5312c66f | |||
| f79fef3dae | |||
| 2c8dc80eae | |||
| a2a2fe7ef4 | |||
| 34cadab809 | |||
| 784e041519 | |||
| 4784f05c8e | |||
| e89b0a6ba2 | |||
| b48d278446 | |||
| 072a64362d | |||
| 7715f519e3 | |||
| 7982f27217 | |||
| eeb3ae1dbe | |||
| 8a73fda6fa | |||
| 05e94249af | |||
| 74c36c66f1 | |||
| 5153f732ce | |||
| fb23e9be79 | |||
| 292640b465 | |||
| a863d91bab | |||
| d1064bb9cd | |||
| a9c3b937e7 | |||
| 6757354652 | |||
| c65efb6ffb | |||
| f9cc279854 | |||
| b2d00cb5ae | |||
| 782721751a | |||
| 01086766ba | |||
| bf0a6ab659 | |||
| a3e6f8a6b5 | |||
| cd9ba5dc19 | |||
| 8e0d35a80d | |||
| a49fb60555 | |||
| ec26179d2a | |||
| daed26cba6 | |||
| 7c820b70ac | |||
| edb15f11db | |||
| 18000429b0 | |||
| d975e61966 | |||
| 663e00cad6 | |||
| 6725193545 | |||
| ccfd91b1ac | |||
| c8b69d641f | |||
| 7af11fc427 | |||
| 59b91fc1ff | |||
| 4293096ed2 | |||
| 42dd98426c | |||
| 744520c73f | |||
| 1b8ae09866 | |||
| 3027e39665 | |||
| b77fe446f8 | |||
| bc11d7508f | |||
| cd9af3c216 | |||
| c60face0e6 | |||
| 334ca1a184 | |||
| b7bb6f10a9 | |||
| 7b14343cc5 | |||
| 62c1f87e95 | |||
| 317f15bbb8 | |||
| 34c0c05715 | |||
| d23bde75b5 | |||
| 46e48efe52 | |||
| 1bf59c20d4 | |||
| 3592a5907c | |||
| 328a8b215c | |||
| 57ba6411e4 | |||
| 4d53d2dc63 | |||
| 2671794f22 | |||
| 9eff09ca68 | |||
| 7f1d972105 | |||
| d05413a54e | |||
| 2342bd9a38 | |||
| c9a6df5614 | |||
| 295f1ce7ab | |||
| 4ca97546b5 | |||
| 166dc4b729 | |||
| f09929648e | |||
| 7d906e0c9c | |||
| dc32a4eb7f | |||
| 5b5f95e0ec | |||
| a0fd9012d2 | |||
| 14910ed568 | |||
| ccc936f821 | |||
| 877e693eb3 | |||
| 9f3634f2ec | |||
| 08d905805a | |||
| 92cf2167cd | |||
| 3d6a208aa8 | |||
| 6e61f364da | |||
| 399fcb8466 | |||
| 477d83e31b | |||
| e761f84023 | |||
| caca21fac9 | |||
| 4f2934fbae | |||
| 8c3c52c92b | |||
| 779b56394a | |||
| 3b11cdc2c6 | |||
| 1a823cda6f | |||
| 6a29264caf | |||
| 4d32de8c2f | |||
| f7cce657a8 | |||
| a4ca827a5c | |||
| 224107e35e | |||
| 9efebd027d | |||
| 841156e8b5 | |||
| ab4d06a44c | |||
| 0766bf7d76 | |||
| f7c7e338e2 | |||
| 6a4fed07ee | |||
| f644817c04 |
0
.fleet/settings.json
Normal file
0
.fleet/settings.json
Normal file
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -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
|
||||
|
||||
228
CHANGELOG.md
228
CHANGELOG.md
@@ -1,5 +1,233 @@
|
||||
# Changelog
|
||||
|
||||
## 7.3.0
|
||||
|
||||
## 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`
|
||||
|
||||
## 5.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `7.0.0`
|
||||
* `microutils`: `0.17.5`
|
||||
|
||||
## 4.1.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `6.1.0`
|
||||
* `microutils`: `0.17.3`
|
||||
|
||||
## 4.0.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `6.0.3`
|
||||
* `microutils`: `0.17.2`
|
||||
|
||||
## 4.0.2
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `6.0.2`
|
||||
|
||||
## 4.0.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `6.0.1`
|
||||
* `microutils`: `17.0.1`
|
||||
* `ktor`: `2.2.4`
|
||||
|
||||
## 4.0.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.8.10`
|
||||
* `tgbotapi`: `6.0.0`
|
||||
* `microutils`: `0.17.0`
|
||||
|
||||
## 3.5.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `5.2.0`
|
||||
* `microutils`: `0.16.10`
|
||||
* `koin`: `3.3.2`
|
||||
|
||||
## 3.4.1
|
||||
|
||||
* `setupBotPlugin` now works synchronously
|
||||
|
||||
## 3.4.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `5.1.0`
|
||||
* `microutils`: `0.16.8`
|
||||
* `ktor`: `2.2.3`
|
||||
|
||||
## 3.3.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `5.0.1`
|
||||
* `microutils`: `0.16.6`
|
||||
* `ktor`: `2.2.2`
|
||||
|
||||
## 3.3.0
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `5.0.0`
|
||||
|
||||
## 3.2.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.2.3`
|
||||
* `microutils`: `0.16.4`
|
||||
|
||||
## 3.2.2
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.2.2`
|
||||
* `microutils`: `0.16.2`
|
||||
|
||||
## 3.2.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.2.1`
|
||||
* `microutils`: `0.16.0`
|
||||
* `ktor`: `2.2.1`
|
||||
|
||||
## 3.2.0
|
||||
|
||||
* `Versions`:
|
||||
* `kotlin`: `1.7.22`
|
||||
* `tgbotapi`: `4.2.0`
|
||||
* `microutils`: `0.15.0`
|
||||
* `kslog`: `0.5.4`
|
||||
* `sqlite`: `3.40.0.0`
|
||||
|
||||
## 3.1.4
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.3`
|
||||
* `microutils`: `0.14.4`
|
||||
|
||||
## 3.1.3
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.2`
|
||||
|
||||
## 3.1.2
|
||||
|
||||
* `Versions`:
|
||||
* `microutils`: `0.14.2`
|
||||
* `exposed`: `0.41.1`
|
||||
|
||||
## 3.1.1
|
||||
|
||||
* `Versions`:
|
||||
* `tgbotapi`: `4.1.1`
|
||||
|
||||
## 3.1.0
|
||||
|
||||
* `Versions`:
|
||||
|
||||
@@ -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,6 +19,7 @@ dependencies {
|
||||
api libs.tgbotapi
|
||||
api libs.tgbotapi.behaviourBuilder.fsm
|
||||
api libs.microutils.repos.exposed
|
||||
api libs.microutils.koin
|
||||
api libs.kslog
|
||||
|
||||
api libs.sqlite
|
||||
@@ -32,7 +34,10 @@ application {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
ksp { // this generator do not require any arguments and we should left `ksp` empty
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
@@ -49,14 +49,32 @@ publishing {
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -78,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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Bot","description":"Base PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
@@ -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?
|
||||
}
|
||||
@@ -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?
|
||||
}
|
||||
@@ -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
|
||||
@@ -63,20 +64,18 @@ data class PlaguBot(
|
||||
}
|
||||
|
||||
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {
|
||||
config.plugins.map { plugin ->
|
||||
launch {
|
||||
runCatchingSafely {
|
||||
logger.i("Start loading of $plugin")
|
||||
with(plugin) {
|
||||
setupBotPlugin(koin)
|
||||
}
|
||||
}.onFailure { e ->
|
||||
logger.w("Unable to load bot part of $plugin", e)
|
||||
}.onSuccess {
|
||||
logger.i("Complete loading of $plugin")
|
||||
config.plugins.forEach { plugin ->
|
||||
runCatchingSafely {
|
||||
logger.i("Start loading of $plugin")
|
||||
with(plugin) {
|
||||
setupBotPlugin(koin)
|
||||
}
|
||||
}.onFailure { e ->
|
||||
logger.w("Unable to load bot part of $plugin", e)
|
||||
}.onSuccess {
|
||||
logger.i("Complete loading of $plugin")
|
||||
}
|
||||
}.joinAll()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -96,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 = {
|
||||
@@ -103,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" }
|
||||
|
||||
@@ -8,6 +8,7 @@ buildscript {
|
||||
classpath libs.buildscript.kt.gradle
|
||||
classpath libs.buildscript.kt.serialization
|
||||
classpath libs.buildscript.gh.release
|
||||
classpath libs.buildscript.ksp
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +17,7 @@ allprojects {
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
org.gradle.jvmargs=-Xmx2048m
|
||||
qorg.gradle.jvmargs=-Xmx2048m
|
||||
kotlin.code.style=official
|
||||
org.gradle.parallel=true
|
||||
kotlin.js.generate.externals=true
|
||||
kotlin.incremental=true
|
||||
|
||||
group=dev.inmo
|
||||
version=3.1.0
|
||||
version=7.4.0
|
||||
|
||||
@@ -1,26 +1,28 @@
|
||||
[versions]
|
||||
|
||||
kt = "1.7.21"
|
||||
kt-serialization = "1.4.1"
|
||||
kt-coroutines = "1.6.4"
|
||||
kt = "1.9.20"
|
||||
kt-serialization = "1.6.0"
|
||||
kt-coroutines = "1.7.3"
|
||||
|
||||
microutils = "0.14.1"
|
||||
tgbotapi = "4.1.0"
|
||||
kslog = "0.5.3"
|
||||
microutils = "0.20.12"
|
||||
tgbotapi = "9.3.0"
|
||||
kslog = "1.2.3"
|
||||
|
||||
jb-exposed = "0.40.1"
|
||||
jb-dokka = "1.7.20"
|
||||
ksp = "1.9.20-1.0.14"
|
||||
|
||||
sqlite = "3.39.3.0"
|
||||
jb-exposed = "0.44.1"
|
||||
jb-dokka = "1.9.10"
|
||||
|
||||
klock = "3.4.0"
|
||||
uuid = "0.6.0"
|
||||
sqlite = "3.43.0.0"
|
||||
|
||||
ktor = "2.1.3"
|
||||
klock = "4.0.10"
|
||||
uuid = "0.8.1"
|
||||
|
||||
ktor = "2.3.5"
|
||||
|
||||
gh-release = "2.4.1"
|
||||
|
||||
koin = "3.2.2"
|
||||
koin = "3.5.0"
|
||||
|
||||
[libraries]
|
||||
|
||||
@@ -32,6 +34,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" }
|
||||
microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
|
||||
microutils-koin-generator = { module = "dev.inmo:micro_utils.koin.generator", version.ref = "microutils" }
|
||||
kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
|
||||
|
||||
koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
||||
@@ -48,3 +52,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" }
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -19,6 +19,6 @@ dependencies {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
@@ -49,14 +49,32 @@ publishing {
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
|
||||
maven {
|
||||
name = "Gitea"
|
||||
url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
|
||||
|
||||
credentials(HttpHeaderCredentials) {
|
||||
name = "Authorization"
|
||||
value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
|
||||
}
|
||||
|
||||
authentication {
|
||||
header(HttpHeaderAuthentication)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -78,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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/PlaguBot/LICENSE"}],"mavenConfig":{"name":"PlaguBot Plugin","description":"Base dependency for whole PlaguBot project","url":"https://github.com/InsanusMokrassar/PlaguBot","vcsUrl":"ssh://git@github.com/InsanusMokrassar/PlaguBot.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
|
||||
Reference in New Issue
Block a user