⬆️ version bumps

Author: Simon Naumov

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.2.9] - 03.03.2023
+
+### Changed
+
+- Dependency version bumps
+
 ## [1.2.8] - 02.06.2022
 
 ### Fixed
@@ -157,6 +163,7 @@
 -   Implicit party pulling
 -   Rude mode
 
+[1.2.9]: https://github.com/pool-party/pull-party-bot/compare/v1.2.8...v1.2.9
 [1.2.8]: https://github.com/pool-party/pull-party-bot/compare/v1.2.7...v1.2.8
 [1.2.7]: https://github.com/pool-party/pull-party-bot/compare/v1.2.6...v1.2.7
 [1.2.6]: https://github.com/pool-party/pull-party-bot/compare/v1.2.5...v1.2.6

Procfile

@@ -1 +1 @@
-web: java -jar build/libs/pull-party-bot-1.2.8.jar
+web: java -jar build/libs/pull-party-bot-1.2.9.jar

README.md

@@ -97,7 +97,7 @@ Use these commands to mention members of needed parties, see the information and
 
     > To set up required version of gradle and dependencies run `gradlew` script (according to your system) with `build` target.
 
--   [Heroku deployment service](https://www.heroku.com)
+-   [Northflank deployment service](https://northflank.com/)
 
 -   [JetBrains Exposed SQL DSL](https://github.com/JetBrains/Exposed)
 
@@ -124,11 +124,12 @@ Use these commands to mention members of needed parties, see the information and
 In order to be able to launch the bot server locally you have to compile sources with gradle and set the following environment variables
 or provide corresponding values in [`defaults.properties`](src/main/resources/defaults.properties):
 
--   `TELEGRAM_TOKEN` - the one you get from [`BotFather`](https://t.me/BotFather)
+- `TELEGRAM_TOKEN` - the one you get from [`BotFather`](https://t.me/BotFather)
+- `DATABASE_URL`
+- `LONGPOLL=true` for using long polling instead of web hooking (common usage case is local launch and debugging)
+- `APP_URL` - webhook url
+- `DEVELOPER_CHAT_ID` for error logs
 
--   `JDBC_DATABASE_URL`, `JDBC_DATABASE_USERNAME`, `JDBC_DATABASE_PASSWORD` - all provided by heroku on database deployment
-
--   `LONGPOLL=true` for using long polling instead of web hooking (common usage case is local launch and debugging)
 
 ### Database migrations
 

build.gradle.kts

@@ -8,15 +8,14 @@ plugins {
 }
 
 group = "org.pool-party"
-version = "1.2.8"
+version = "1.2.9"
 
 repositories {
     maven("https://jitpack.io")
     mavenCentral()
 }
 
 dependencies {
-
     implementation(libs.kotlin.std)
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.serialization)
@@ -65,3 +64,14 @@ tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
     kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
 }
+
+configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+    disabledRules.set(
+        setOf(
+            "package-name",
+            "multiline-if-else",
+            "trailing-comma-on-call-site",
+            "trailing-comma-on-declaration-site",
+        )
+    )
+}

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-kotlin = "1.7.0"
-testContainers = "1.17.1"
-jupiter = "5.8.2"
-exposed = "0.38.1"
-flyway = "8.5.8"
+kotlin = "1.8.10"
+testContainers = "1.17.6"
+jupiter = "5.9.2"
+exposed = "0.41.1"
+flyway = "9.15.1"
 
 [plugins]
 jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.3.0" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.2.0" }
 flyway = { id = "org.flywaydb.flyway", version.ref = "flyway" }
 
 [libraries]
@@ -17,22 +17,22 @@ flyway = { id = "org.flywaydb.flyway", version.ref = "flyway" }
 
 kotlin-std = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
-kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.3.3" }
+kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.5.0" }
 
 exposed-core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
 exposed-dao = { group = "org.jetbrains.exposed", name = "exposed-dao", version.ref = "exposed" }
 exposed-jdbc = { group = "org.jetbrains.exposed", name = "exposed-jdbc", version.ref = "exposed" }
 exposed-jodatime = { group = "org.jetbrains.exposed", name = "exposed-jodatime", version.ref = "exposed" }
-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.3.4" }
+postgresql = { group = "org.postgresql", name = "postgresql", version = "42.5.4" }
 
-telegramBot = { group = "com.github.elbekD", name = "kt-telegram-bot", version = "2.1.4" }
+telegramBot = { group = "com.github.elbekD", name = "kt-telegram-bot", version = "2.2.0" }
 
 flyway = { group = "org.flywaydb", name = "flyway-core", version.ref = "flyway" }
 
 konfig = { group = "com.natpryce", name = "konfig", version = "1.6.10.0" }
 
 slf4j = { group = "org.slf4j", name = "slf4j-simple", version = "2.0.0-alpha7" }
-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "2.1.21" }
+logging = { group = "io.github.microutils", name = "kotlin-logging", version = "4.0.0-beta-2" }
 
 stringSimilarity = { group = "info.debatty", name = "java-string-similarity", version = "2.0.0" }
 
@@ -42,6 +42,6 @@ kotlin-test-junit5 = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit
 jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
 jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
 
-mockk = { group = "io.mockk", name = "mockk", version = "1.12.4" }
+mockk = { group = "io.mockk", name = "mockk", version = "1.13.4" }
 testContainers-jupiter = { group = "org.testcontainers", name = "junit-jupiter", version.ref = "testContainers" }
 testContainers-postgres = { group = "org.testcontainers", name = "postgresql", version.ref = "testContainers" }

src/main/kotlin/com/github/pool_party/pull_party_bot/Configuration.kt

@@ -69,7 +69,7 @@ object Configuration {
     private fun double() = Configured(doubleType)
 
     private fun getDatabaseUrl(): MatchResult =
-        """postgres://(\w+):([\w\d]+)@([\w\d\-\.]+):(\d+)/([\w\d]+)""".toRegex().matchEntire(DATABASE_URL)
+        """postgresql://([_\w]+):([_\w\d]+)@([\w\d\-\.]+):(\d+)/([_\w\d]+)""".toRegex().matchEntire(DATABASE_URL)
             ?: throw RuntimeException("Bad DATABASE_URL format")
 
     private val <T> KProperty<T>.configName

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Callback.kt

@@ -5,7 +5,7 @@ import com.elbekd.bot.types.CallbackQuery
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import mu.KotlinLogging
+import mu.two.KotlinLogging
 
 private val logger = KotlinLogging.logger {}
 

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Command.kt

@@ -11,7 +11,7 @@ import com.github.pool_party.pull_party_bot.commands.messages.ON_ADMINS_PARTY_CH
 import com.github.pool_party.pull_party_bot.commands.messages.ON_PERMISSION_DENY
 import com.github.pool_party.pull_party_bot.commands.messages.ON_SENDER_FAIL
 import com.github.pool_party.pull_party_bot.database.dao.ChatDao
-import mu.KotlinLogging
+import mu.two.KotlinLogging
 import java.time.LocalDateTime
 import kotlin.system.measureNanoTime
 

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/Handlers.kt

@@ -25,10 +25,9 @@ import com.github.pool_party.pull_party_bot.commands.handlers.callback.PingCallb
 import com.github.pool_party.pull_party_bot.commands.messages.onError
 import com.github.pool_party.pull_party_bot.database.dao.ChatDaoImpl
 import com.github.pool_party.pull_party_bot.database.dao.PartyDaoImpl
-import mu.KotlinLogging
+import mu.two.KotlinLogging
 
 suspend fun Bot.initHandlers() {
-
     val partyDaoImpl = PartyDaoImpl()
 
     val chatDaoImpl = ChatDaoImpl()
@@ -82,7 +81,11 @@ private suspend fun Bot.processThrowable(throwable: Throwable): Nothing {
         if (throwable is SendingMessageException) "${throwable.action}: " to throwable.reason else "" to throwable
 
     logger.error { "$prefix${reason.message}:\n${reason.stackTraceToString()}" }
-    sendMessage(Configuration.DEVELOP_CHAT_ID.toChatId(), onError(reason).escapeSpecial(), ParseMode.MarkdownV2)
+    sendMessage(
+        Configuration.DEVELOP_CHAT_ID.toChatId(),
+        onError(reason).escapeSpecial(),
+        parseMode = ParseMode.MarkdownV2,
+    )
 
     throw reason
 }

src/main/kotlin/com/github/pool_party/pull_party_bot/commands/MessageUtils.kt

@@ -7,7 +7,7 @@ import com.elbekd.bot.types.ChatMember
 import com.elbekd.bot.types.Message
 import com.elbekd.bot.types.ParseMode
 import com.elbekd.bot.types.ReplyKeyboard
-import mu.KotlinLogging
+import mu.two.KotlinLogging
 
 private val logger = KotlinLogging.logger { }
 
@@ -39,7 +39,7 @@ suspend fun Bot.sendMessageLogging(
     return sendMessage(
         chatId.toChatId(),
         text.escapeSpecial(),
-        ParseMode.MarkdownV2,
+        parseMode = ParseMode.MarkdownV2,
         replyToMessageId = replyTo,
         replyMarkup = markup,
     )