Revert "rework to use just Java target"

This reverts commit 0273284023.

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.kotlin/
 out/*
 *.iml
 target

CHANGELOG.md

@@ -1,5 +1,9 @@
 # PlaguPoster
 
+## 0.7.0
+
+* Dependencies update
+
 ## 0.6.0
 
 * Dependencies update

gradle.properties

@@ -9,4 +9,4 @@ android.enableJetifier=true
 # Project data
 
 group=dev.inmo
-version=0.6.0
+version=0.7.0

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 
-kotlin = "1.9.23"
-kotlin-serialization = "1.6.3"
+kotlin = "2.0.20"
+kotlin-serialization = "1.7.2"
 
-plagubot = "8.4.0"
-tgbotapi = "15.0.0"
-microutils = "0.21.1"
-kslog = "1.3.4"
-krontab = "2.3.0"
-plagubot-plugins = "0.19.0"
+plagubot = "9.2.0"
+tgbotapi = "18.1.0"
+microutils = "0.22.2"
+kslog = "1.3.6"
+krontab = "2.4.0"
+plagubot-plugins = "0.21.0"
 
 dokka = "1.9.20"
 

mppJsProject.gradle

@@ -25,7 +25,6 @@ kotlin {
         jsTest {
             dependencies {
                 implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
             }
         }
     }

mppProjectWithSerialization.gradle

@@ -37,7 +37,6 @@ kotlin {
         jsTest {
             dependencies {
                 implementation libs.kotlin.test.js
-                implementation libs.kotlin.test.junit
             }
         }
 

posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt

@@ -48,7 +48,7 @@ class ExposedPostsRepo(
                 id,
                 DateTime(get(createdColumn)),
                 with(contentRepo) {
-                    select { postIdColumn.eq(id.string) }.map {
+                    selectAll().where { postIdColumn.eq(id.string) }.map {
                         it.asObject
                     }
                 }
@@ -69,14 +69,14 @@ class ExposedPostsRepo(
             id,
             DateTime(get(createdColumn)),
             with(contentRepo) {
-                select { postIdColumn.eq(id.string) }.map {
+                selectAll().where { postIdColumn.eq(id.string) }.map {
                     it.asObject
                 }
             }
         )
     }
 
-    override fun createAndInsertId(value: NewPost, it: InsertStatement<Number>): PostId {
+    override fun createAndInsertId(value: NewPost, it: UpdateBuilder<Int>): PostId {
         val id = PostId(uuid4().toString())
         it[idColumn] = id.string
         return id
@@ -104,7 +104,7 @@ class ExposedPostsRepo(
         }
     }
 
-    override fun insert(value: NewPost, it: InsertStatement<Number>) {
+    override fun insert(value: NewPost, it: UpdateBuilder<Int>) {
         super.insert(value, it)
         it[createdColumn] = DateTime.now().unixMillis
     }
@@ -144,7 +144,7 @@ class ExposedPostsRepo(
                 existsIds
             } else {
                 existsIds.filter {
-                    select { selectById(it) }.limit(1).none()
+                    selectAll().where { selectById(it) }.limit(1).none()
                 }
             }
         }.forEach {
@@ -156,7 +156,7 @@ class ExposedPostsRepo(
     override suspend fun getIdByChatAndMessage(chatId: IdChatIdentifier, messageId: MessageId): PostId? {
         return transaction(database) {
             with(contentRepo) {
-                select {
+                selectAll().where {
                     chatIdColumn.eq(chatId.chatId.long)
                         .and(chatId.threadId ?.let { threadIdColumn.eq(it.long) } ?: threadIdColumn.isNull())
                         .and(messageIdColumn.eq(messageId.long))
@@ -166,12 +166,12 @@ class ExposedPostsRepo(
     }
 
     override suspend fun getPostCreationTime(postId: PostId): DateTime? = transaction(database) {
-        select { selectById(postId) }.limit(1).firstOrNull() ?.get(createdColumn) ?.let(::DateTime)
+        selectAll().where { selectById(postId) }.limit(1).firstOrNull() ?.get(createdColumn) ?.let(::DateTime)
     }
 
     override suspend fun getFirstMessageInfo(postId: PostId): PostContentInfo? = transaction(database) {
         with(contentRepo) {
-            select { postIdColumn.eq(postId.string) }.limit(1).firstOrNull() ?.asObject
+            selectAll().where { postIdColumn.eq(postId.string) }.limit(1).firstOrNull() ?.asObject
         }
     }
 }

ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt

@@ -44,7 +44,7 @@ class ExposedPollsToMessagesInfoRepo(
         it[messageIdColumn] = v.messageId.long
     }
 
-    override fun insertKey(k: PollId, v: ShortMessageInfo, it: InsertStatement<Number>) {
+    override fun insertKey(k: PollId, v: ShortMessageInfo, it: UpdateBuilder<Int>) {
         it[keyColumn] = k.string
     }
 }

ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt

@@ -27,7 +27,7 @@ class ExposedPollsToPostsIdsRepo(
         it[postIdColumn] = v.string
     }
 
-    override fun insertKey(k: PollId, v: PostId, it: InsertStatement<Number>) {
+    override fun insertKey(k: PollId, v: PostId, it: UpdateBuilder<Int>) {
         it[keyColumn] = k.string
     }
 }

ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt

@@ -33,7 +33,7 @@ class ExposedRatingsRepo (
         it[ratingsColumn] = v.double
     }
 
-    override fun insertKey(k: PostId, v: Rating, it: InsertStatement<Number>) {
+    override fun insertKey(k: PostId, v: Rating, it: UpdateBuilder<Int>) {
         it[keyColumn] = k.string
     }
 

triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt

@@ -50,7 +50,7 @@ class ExposedTimersRepo(
         it[dateTimeColumn] = v.unixMillisLong
     }
 
-    override fun insertKey(k: PostId, v: DateTime, it: InsertStatement<Number>) {
+    override fun insertKey(k: PostId, v: DateTime, it: UpdateBuilder<Int>) {
         it[keyColumn] = k.string
     }