Update microutils to v0.26.5

Update dependency io.ktor:ktor-client-okhttp to v2.3.12

.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

.github/workflows/docker-publish.yml

@@ -14,6 +14,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
       - name: Log into registry
         uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
         with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM bellsoft/liberica-openjdk-alpine:19
 
 ADD ./build/distributions/booru_grabber_bot.tar /
 RUN chown -R 1000:1000 "/booru_grabber_bot"

build.gradle

@@ -41,6 +41,6 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

docker-compose.yml

@@ -10,3 +10,8 @@ services:
       POSTGRES_DB: "test"
     ports:
       - "8092:5432"
+#  booru_grabber_bot:
+#    image: insanusmokrassar/booru_grabber_bot
+#    container_name: "booru_grabber_bot"
+#    volumes:
+#      - "path_to_file:/booru_grabber_bot/config.json:ro"

gradle.properties

@@ -4,4 +4,4 @@ org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 
-docker_version=0.0.4
+docker_version=0.0.5

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 
-kotlin = "1.9.10"
-tgbotapi = "9.2.2"
-microutils = "0.20.7"
-imageboard = "2.6.0"
-krontab = "2.2.1"
-kslog = "1.2.1"
-ktor = "2.3.5"
-exposed = "0.44.0"
-psql = "42.6.0"
-clikt = "4.2.1"
+kotlin = "2.2.10"
+tgbotapi = "28.0.2"
+microutils = "0.26.5"
+imageboard = "2.7.0"
+krontab = "2.7.2"
+kslog = "1.5.0"
+ktor = "3.2.3"
+exposed = "0.61.0"
+psql = "42.7.4"
+clikt = "5.0.1"
 
 [libraries]
 

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

settings.gradle

@@ -1,3 +1 @@
 rootProject.name = 'booru_grabber_bot'
-
-enableFeaturePreview("VERSION_CATALOGS")

src/main/kotlin/App.kt

@@ -1,3 +1,4 @@
+import com.github.ajalt.clikt.core.parse
 import dev.inmo.krontab.utils.asFlowWithDelays
 import dev.inmo.micro_utils.coroutines.*
 import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
@@ -63,9 +64,9 @@ suspend fun main(args: Array<String>) {
         { text("config") },
         "configs"
     ).withMapper(
-        { chatId },
+        { chatId.long },
         { json.encodeToString(ChatSettings.serializer(), this) },
-        { ChatId(this) },
+        { ChatId(RawChatId(this)) },
         { json.decodeFromString(ChatSettings.serializer(), this) },
     ).fullyCached(scope = scope)
 
@@ -75,9 +76,9 @@ suspend fun main(args: Array<String>) {
         { text("url") },
         "chatsUrlsSeen"
     ).withMapper(
-        { chatId },
+        { chatId.long },
         { this },
-        { ChatId(this) },
+        { ChatId(RawChatId(this)) },
         { this },
     )