From 3941c1dfed9ed31131b353266b5b244ea2a8e1cb Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Jul 2024 21:28:37 +0600 Subject: [PATCH 1/8] start 0.7.0 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4a8923..855217b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # PlaguPoster +## 0.7.0 + ## 0.6.0 * Dependencies update diff --git a/gradle.properties b/gradle.properties index e265d68..1188d97 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.6.0 +version=0.7.0 From e567f5b3b4df100e3b50aeb018c8082a38cddaf9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 13 Jul 2024 21:39:37 +0600 Subject: [PATCH 2/8] update dependencies --- CHANGELOG.md | 2 ++ gradle/libs.versions.toml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 855217b..e75b7c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.7.0 +* Dependencies update + ## 0.6.0 * Dependencies update diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 229ab2b..73c6250 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,12 +3,12 @@ kotlin = "1.9.23" kotlin-serialization = "1.6.3" -plagubot = "8.4.0" -tgbotapi = "15.0.0" -microutils = "0.21.1" +plagubot = "8.5.0" +tgbotapi = "15.1.0" +microutils = "0.21.2" kslog = "1.3.4" krontab = "2.3.0" -plagubot-plugins = "0.19.0" +plagubot-plugins = "0.19.1" dokka = "1.9.20" From a4686a56df64cffb1cbe72d8f9f16478d3f05d46 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Aug 2024 00:05:12 +0600 Subject: [PATCH 3/8] update dependencies --- .gitignore | 1 + gradle/libs.versions.toml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7e5545b..61f7b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.kotlin/ out/* *.iml target diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 73c6250..9d215e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kotlin = "1.9.23" -kotlin-serialization = "1.6.3" +kotlin = "2.0.10" +kotlin-serialization = "1.7.1" -plagubot = "8.5.0" -tgbotapi = "15.1.0" -microutils = "0.21.2" -kslog = "1.3.4" -krontab = "2.3.0" -plagubot-plugins = "0.19.1" +plagubot = "9.0.0" +tgbotapi = "16.0.0" +microutils = "0.22.0" +kslog = "1.3.5" +krontab = "2.4.0" +plagubot-plugins = "0.20.0" dokka = "1.9.20" From 18b8ce0d3d8040d9769be8d268a58647a361a755 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Aug 2024 02:10:58 +0600 Subject: [PATCH 4/8] Update mppProjectWithSerialization.gradle --- mppProjectWithSerialization.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index e1b3148..d65cc00 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -37,7 +37,6 @@ kotlin { jsTest { dependencies { implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit } } From b879426f9db6803a7128e662a36b85e0a45675c1 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 13 Aug 2024 02:11:33 +0600 Subject: [PATCH 5/8] Update mppJsProject.gradle --- mppJsProject.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/mppJsProject.gradle b/mppJsProject.gradle index f7499b3..5e0b8b4 100644 --- a/mppJsProject.gradle +++ b/mppJsProject.gradle @@ -25,7 +25,6 @@ kotlin { jsTest { dependencies { implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit } } } From 9af72d5d0f4f7f94446c60c4cc1d3bb475329a6a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 Sep 2024 22:42:13 +0600 Subject: [PATCH 6/8] fix build --- gradle/libs.versions.toml | 14 +++++++------- .../jvmMain/kotlin/exposed/ExposedPostsRepo.kt | 16 ++++++++-------- .../repos/ExposedPollsToMessagesInfoRepo.kt | 2 +- .../kotlin/repos/ExposedPollsToPostsIdsRepo.kt | 2 +- .../jvmMain/kotlin/exposed/ExposedRatingsRepo.kt | 2 +- .../src/jvmMain/kotlin/repo/ExposedTimersRepo.kt | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d215e8..3df21b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kotlin = "2.0.10" -kotlin-serialization = "1.7.1" +kotlin = "2.0.20" +kotlin-serialization = "1.7.2" -plagubot = "9.0.0" -tgbotapi = "16.0.0" -microutils = "0.22.0" -kslog = "1.3.5" +plagubot = "9.2.0" +tgbotapi = "18.1.0" +microutils = "0.22.2" +kslog = "1.3.6" krontab = "2.4.0" -plagubot-plugins = "0.20.0" +plagubot-plugins = "0.21.0" dokka = "1.9.20" diff --git a/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt b/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt index 881e745..a448f9e 100644 --- a/posts/src/jvmMain/kotlin/exposed/ExposedPostsRepo.kt +++ b/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): PostId { + override fun createAndInsertId(value: NewPost, it: UpdateBuilder): 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) { + override fun insert(value: NewPost, it: UpdateBuilder) { 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 } } } diff --git a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt index 7bd2667..d7d151a 100644 --- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToMessagesInfoRepo.kt +++ b/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) { + override fun insertKey(k: PollId, v: ShortMessageInfo, it: UpdateBuilder) { it[keyColumn] = k.string } } diff --git a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt b/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt index e8b5b0a..2804677 100644 --- a/ratings/source/src/jvmMain/kotlin/repos/ExposedPollsToPostsIdsRepo.kt +++ b/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) { + override fun insertKey(k: PollId, v: PostId, it: UpdateBuilder) { it[keyColumn] = k.string } } diff --git a/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt b/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt index 8a6dd5d..db39cae 100644 --- a/ratings/src/jvmMain/kotlin/exposed/ExposedRatingsRepo.kt +++ b/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) { + override fun insertKey(k: PostId, v: Rating, it: UpdateBuilder) { it[keyColumn] = k.string } diff --git a/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt b/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt index e8baf87..9f63e1a 100644 --- a/triggers/timer/src/jvmMain/kotlin/repo/ExposedTimersRepo.kt +++ b/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) { + override fun insertKey(k: PostId, v: DateTime, it: UpdateBuilder) { it[keyColumn] = k.string } From 0273284023d56b72b31aac6d19073e55a3752e79 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 Sep 2024 22:55:33 +0600 Subject: [PATCH 7/8] rework to use just Java target --- common/build.gradle | 2 +- extensions.gradle | 2 -- inlines/build.gradle | 2 +- posts/build.gradle | 2 +- posts/gc/build.gradle | 2 +- posts/panel/build.gradle | 2 +- posts_registrar/build.gradle | 2 +- ratings/build.gradle | 2 +- ratings/gc/build.gradle | 2 +- ratings/selector/build.gradle | 2 +- ratings/source/build.gradle | 2 +- settings/build.gradle | 2 +- template/build.gradle | 2 +- triggers/command/build.gradle | 2 +- triggers/selector_with_timer/build.gradle | 2 +- triggers/timer/build.gradle | 2 +- triggers/timer/disablers/autoposts/build.gradle | 2 +- triggers/timer/disablers/ratings/build.gradle | 2 +- 18 files changed, 17 insertions(+), 19 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 1b4c6b6..947723c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/extensions.gradle b/extensions.gradle index 4312fc0..444a142 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,9 +13,7 @@ allprojects { projectByName(name) } - mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" - mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle" mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" diff --git a/inlines/build.gradle b/inlines/build.gradle index 8c6e39f..f373769 100644 --- a/inlines/build.gradle +++ b/inlines/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/posts/build.gradle b/posts/build.gradle index f2974dd..5a6db6a 100644 --- a/posts/build.gradle +++ b/posts/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/posts/gc/build.gradle b/posts/gc/build.gradle index 9b77c99..87bfbeb 100644 --- a/posts/gc/build.gradle +++ b/posts/gc/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/posts/panel/build.gradle b/posts/panel/build.gradle index 32f902f..cd60b1b 100644 --- a/posts/panel/build.gradle +++ b/posts/panel/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/posts_registrar/build.gradle b/posts_registrar/build.gradle index bb85922..f4b2180 100644 --- a/posts_registrar/build.gradle +++ b/posts_registrar/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/ratings/build.gradle b/ratings/build.gradle index 3793d30..db24298 100644 --- a/ratings/build.gradle +++ b/ratings/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/ratings/gc/build.gradle b/ratings/gc/build.gradle index d8e5ff2..7593b4c 100644 --- a/ratings/gc/build.gradle +++ b/ratings/gc/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/ratings/selector/build.gradle b/ratings/selector/build.gradle index 40f207d..2e70911 100644 --- a/ratings/selector/build.gradle +++ b/ratings/selector/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/ratings/source/build.gradle b/ratings/source/build.gradle index ca1b256..ce8c340 100644 --- a/ratings/source/build.gradle +++ b/ratings/source/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/settings/build.gradle b/settings/build.gradle index d101bd6..31dab5f 100644 --- a/settings/build.gradle +++ b/settings/build.gradle @@ -4,7 +4,7 @@ plugins { id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/template/build.gradle b/template/build.gradle index f95f579..db06d89 100644 --- a/template/build.gradle +++ b/template/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/triggers/command/build.gradle b/triggers/command/build.gradle index 3c42554..6268135 100644 --- a/triggers/command/build.gradle +++ b/triggers/command/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/triggers/selector_with_timer/build.gradle b/triggers/selector_with_timer/build.gradle index b9d3bca..eb1c3cc 100644 --- a/triggers/selector_with_timer/build.gradle +++ b/triggers/selector_with_timer/build.gradle @@ -4,7 +4,7 @@ plugins { } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/build.gradle b/triggers/timer/build.gradle index aa16791..13226fb 100644 --- a/triggers/timer/build.gradle +++ b/triggers/timer/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/disablers/autoposts/build.gradle b/triggers/timer/disablers/autoposts/build.gradle index 0bfbf70..b198b41 100644 --- a/triggers/timer/disablers/autoposts/build.gradle +++ b/triggers/timer/disablers/autoposts/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/disablers/ratings/build.gradle b/triggers/timer/disablers/ratings/build.gradle index 429e53f..5a0dd81 100644 --- a/triggers/timer/disablers/ratings/build.gradle +++ b/triggers/timer/disablers/ratings/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaProjectPresetPath" kotlin { sourceSets { From c2612ec6e9dd823fc79138442ad5fe95074c1f11 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 Sep 2024 22:58:56 +0600 Subject: [PATCH 8/8] Revert "rework to use just Java target" This reverts commit 0273284023d56b72b31aac6d19073e55a3752e79. --- common/build.gradle | 2 +- extensions.gradle | 2 ++ inlines/build.gradle | 2 +- posts/build.gradle | 2 +- posts/gc/build.gradle | 2 +- posts/panel/build.gradle | 2 +- posts_registrar/build.gradle | 2 +- ratings/build.gradle | 2 +- ratings/gc/build.gradle | 2 +- ratings/selector/build.gradle | 2 +- ratings/source/build.gradle | 2 +- settings/build.gradle | 2 +- template/build.gradle | 2 +- triggers/command/build.gradle | 2 +- triggers/selector_with_timer/build.gradle | 2 +- triggers/timer/build.gradle | 2 +- triggers/timer/disablers/autoposts/build.gradle | 2 +- triggers/timer/disablers/ratings/build.gradle | 2 +- 18 files changed, 19 insertions(+), 17 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 947723c..1b4c6b6 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/extensions.gradle b/extensions.gradle index 444a142..4312fc0 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,7 +13,9 @@ allprojects { projectByName(name) } + mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" + mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle" mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" diff --git a/inlines/build.gradle b/inlines/build.gradle index f373769..8c6e39f 100644 --- a/inlines/build.gradle +++ b/inlines/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/posts/build.gradle b/posts/build.gradle index 5a6db6a..f2974dd 100644 --- a/posts/build.gradle +++ b/posts/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/posts/gc/build.gradle b/posts/gc/build.gradle index 87bfbeb..9b77c99 100644 --- a/posts/gc/build.gradle +++ b/posts/gc/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/posts/panel/build.gradle b/posts/panel/build.gradle index cd60b1b..32f902f 100644 --- a/posts/panel/build.gradle +++ b/posts/panel/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/posts_registrar/build.gradle b/posts_registrar/build.gradle index f4b2180..bb85922 100644 --- a/posts_registrar/build.gradle +++ b/posts_registrar/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/ratings/build.gradle b/ratings/build.gradle index db24298..3793d30 100644 --- a/ratings/build.gradle +++ b/ratings/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/ratings/gc/build.gradle b/ratings/gc/build.gradle index 7593b4c..d8e5ff2 100644 --- a/ratings/gc/build.gradle +++ b/ratings/gc/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/ratings/selector/build.gradle b/ratings/selector/build.gradle index 2e70911..40f207d 100644 --- a/ratings/selector/build.gradle +++ b/ratings/selector/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/ratings/source/build.gradle b/ratings/source/build.gradle index ce8c340..ca1b256 100644 --- a/ratings/source/build.gradle +++ b/ratings/source/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/settings/build.gradle b/settings/build.gradle index 31dab5f..d101bd6 100644 --- a/settings/build.gradle +++ b/settings/build.gradle @@ -4,7 +4,7 @@ plugins { id "com.android.library" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/template/build.gradle b/template/build.gradle index db06d89..f95f579 100644 --- a/template/build.gradle +++ b/template/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/triggers/command/build.gradle b/triggers/command/build.gradle index 6268135..3c42554 100644 --- a/triggers/command/build.gradle +++ b/triggers/command/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/triggers/selector_with_timer/build.gradle b/triggers/selector_with_timer/build.gradle index eb1c3cc..b9d3bca 100644 --- a/triggers/selector_with_timer/build.gradle +++ b/triggers/selector_with_timer/build.gradle @@ -4,7 +4,7 @@ plugins { } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/build.gradle b/triggers/timer/build.gradle index 13226fb..aa16791 100644 --- a/triggers/timer/build.gradle +++ b/triggers/timer/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/disablers/autoposts/build.gradle b/triggers/timer/disablers/autoposts/build.gradle index b198b41..0bfbf70 100644 --- a/triggers/timer/disablers/autoposts/build.gradle +++ b/triggers/timer/disablers/autoposts/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { diff --git a/triggers/timer/disablers/ratings/build.gradle b/triggers/timer/disablers/ratings/build.gradle index 5a0dd81..429e53f 100644 --- a/triggers/timer/disablers/ratings/build.gradle +++ b/triggers/timer/disablers/ratings/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" } -apply from: "$mppJavaProjectPresetPath" +apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets {