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