Compare commits

..

34 Commits

Author SHA1 Message Date
14910ed568 Update CHANGELOG.md 2022-12-20 09:18:51 +06:00
ccc936f821 Update libs.versions.toml 2022-12-20 09:15:56 +06:00
877e693eb3 start 3.2.2 2022-12-20 09:13:35 +06:00
9f3634f2ec Merge pull request #58 from InsanusMokrassar/3.2.1
3.2.1
2022-12-08 11:05:38 +06:00
08d905805a Update CHANGELOG.md 2022-12-08 10:47:08 +06:00
92cf2167cd Update libs.versions.toml 2022-12-08 10:46:17 +06:00
3d6a208aa8 Update gradle.properties 2022-12-08 10:45:10 +06:00
6e61f364da Merge pull request #57 from InsanusMokrassar/3.2.0
3.2.0
2022-12-05 16:31:11 +06:00
399fcb8466 update dependencies 2022-12-05 15:45:55 +06:00
477d83e31b start 3.2.0 2022-12-05 15:31:19 +06:00
e761f84023 Merge pull request #56 from InsanusMokrassar/3.1.4
3.1.4
2022-11-28 18:12:36 +06:00
caca21fac9 Update CHANGELOG.md 2022-11-28 16:30:45 +06:00
4f2934fbae Update libs.versions.toml 2022-11-28 16:29:59 +06:00
8c3c52c92b Update gradle.properties 2022-11-28 16:29:11 +06:00
779b56394a Merge pull request #55 from InsanusMokrassar/3.1.3
3.1.3
2022-11-17 13:17:49 +06:00
3b11cdc2c6 update tgbotapi 2022-11-17 13:01:08 +06:00
1a823cda6f add own repo 2022-11-17 13:00:19 +06:00
6a29264caf start 3.1.3 2022-11-17 12:59:39 +06:00
4d32de8c2f add gitea publication 2022-11-17 11:29:02 +06:00
f7cce657a8 Merge pull request #54 from InsanusMokrassar/3.1.2
3.1.2
2022-11-15 17:31:44 +06:00
a4ca827a5c Update CHANGELOG.md 2022-11-15 11:28:43 +06:00
224107e35e Update libs.versions.toml 2022-11-15 09:58:30 +06:00
9efebd027d Update gradle.properties 2022-11-15 09:57:22 +06:00
841156e8b5 Merge pull request #53 from InsanusMokrassar/3.1.1
3.1.1
2022-11-15 02:16:21 +06:00
ab4d06a44c Update CHANGELOG.md 2022-11-15 02:15:06 +06:00
0766bf7d76 Update libs.versions.toml 2022-11-15 00:17:22 +06:00
f7c7e338e2 Update gradle.properties 2022-11-15 00:15:56 +06:00
6a4fed07ee Merge pull request #52 from InsanusMokrassar/3.1.0
3.1.0
2022-11-10 20:57:02 +06:00
88f5fbfd18 Update HelloPlugin.kt 2022-11-10 20:54:34 +06:00
f644817c04 Update HelloPlugin.kt 2022-11-10 20:53:12 +06:00
8a8eb3c3b7 Update CHANGELOG.md 2022-11-10 20:28:26 +06:00
8cb68495c9 Update libs.versions.toml 2022-11-10 20:26:28 +06:00
6f2c922edf start 3.1.0 2022-11-10 20:23:23 +06:00
5895335031 Merge pull request #51 from InsanusMokrassar/3.0.0
3.0.0
2022-11-09 01:14:24 +06:00
10 changed files with 106 additions and 16 deletions

0
.fleet/settings.json Normal file
View File

View File

@@ -1,5 +1,58 @@
# Changelog
## 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`:
* `kotlin`: `1.7.21`
* `microutils`: `0.14.1`
* `tgbotapi`: `4.1.0`
* `klock`: `3.4.0`
* `uuid`: `0.6.0`
## 3.0.0
* `Versions`:

View File

@@ -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')
}
}
}
}

View File

@@ -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"}

View File

@@ -11,7 +11,7 @@ import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitText
import dev.inmo.tgbotapi.extensions.behaviour_builder.expectations.waitTextMessage
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onCommand
import dev.inmo.tgbotapi.extensions.behaviour_builder.triggers_handling.onUnhandledCommand
import dev.inmo.tgbotapi.types.ChatId
import dev.inmo.tgbotapi.types.IdChatIdentifier
import kotlinx.coroutines.flow.first
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -38,9 +38,9 @@ object HelloPlugin : Plugin {
}
private sealed interface InternalFSMState : State {
override val context: ChatId
data class DidntSaidHello(override val context: ChatId) : InternalFSMState
data class SaidHelloOnce(override val context: ChatId) : InternalFSMState
override val context: IdChatIdentifier
data class DidntSaidHello(override val context: IdChatIdentifier) : InternalFSMState
data class SaidHelloOnce(override val context: IdChatIdentifier) : InternalFSMState
}
override suspend fun BehaviourContextWithFSM<State>.setupBotPlugin(koin: Koin) {

View File

@@ -16,6 +16,7 @@ allprojects {
mavenCentral()
mavenLocal()
maven { url 'https://jitpack.io' }
maven { url "https://git.inmo.dev/api/packages/InsanusMokrassar/maven" }
}
}

View File

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

View File

@@ -1,22 +1,22 @@
[versions]
kt = "1.7.20"
kt = "1.7.22"
kt-serialization = "1.4.1"
kt-coroutines = "1.6.4"
microutils = "0.14.0"
tgbotapi = "4.0.0"
kslog = "0.5.3"
microutils = "0.16.2"
tgbotapi = "4.2.2"
kslog = "0.5.4"
jb-exposed = "0.40.1"
jb-exposed = "0.41.1"
jb-dokka = "1.7.20"
sqlite = "3.39.3.0"
sqlite = "3.40.0.0"
klock = "3.3.1"
uuid = "0.5.0"
klock = "3.4.0"
uuid = "0.6.0"
ktor = "2.1.3"
ktor = "2.2.1"
gh-release = "2.4.1"

View File

@@ -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')
}
}
}
}

View File

@@ -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"}