From c2612ec6e9dd823fc79138442ad5fe95074c1f11 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 Sep 2024 22:58:56 +0600 Subject: [PATCH] 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 {