Revert "rework to use just Java target"

This reverts commit 0273284023.
2024-11-17 05:23:46 +00:00 · 2024-09-07 22:58:56 +06:00 · 2024-09-07 22:58:56 +06:00 · c2612ec6e9
commit c2612ec6e9
parent 0273284023
18 changed files with 19 additions and 17 deletions
--- 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 {
--- 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"
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {