Merge a13e91d246 into 6dced2d86e

.templates/mpp_android_module/{{.module_name.lowercase()}}/build.gradle

@@ -4,5 +4,5 @@ plugins {
     id "com.android.library"
 }
 
-apply from: "$mppAndroidProject"
+apply from: "$mppAndroidProjectPresetPath"
 

.templates/mpp_java_module/{{.module_name.lowercase()}}/build.gradle

@@ -3,5 +3,5 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
-apply from: "$mppJavaProject"
+apply from: "$mppJavaProjectPresetPath"
 

.templates/mpp_js_module/{{.module_name.lowercase()}}/build.gradle

@@ -3,5 +3,5 @@ plugins {
     id "org.jetbrains.kotlin.plugin.serialization"
 }
 
-apply from: "$mppJsProject"
+apply from: "$mppJsProjectPresetPath"
 

.templates/mpp_module/{{.module_name.lowercase()}}/build.gradle

@@ -4,5 +4,5 @@ plugins {
     id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerialization"
+apply from: "$mppProjectWithSerializationPresetPath"
 

extensions.gradle

@@ -1,14 +1,6 @@
-File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")
+allprojects {
-
+    ext {
-Map properties = new HashMap<String, String>()
+        projectByName = { String name ->
-
-if (templatesFolder.exists() && templatesFolder.isDirectory()) {
-    templatesFolder.listFiles().each {
-        properties[it.name - ".gradle"] = it.absolutePath
-    }
-}
-
-properties["projectByName"] = { name ->
             for (subproject in rootProject.subprojects) {
                 if (subproject.name == name) {
                     return subproject
@@ -17,16 +9,17 @@ properties["projectByName"] = { name ->
             return null
         }
 
-properties["internalProject"] = { name ->
+        internalProject = { String name ->
-    projectByName("$name")
+            projectByName(name)
         }
 
-allprojects {
+        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
-    ext {
+        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
-        releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
+        mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
+        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
 
-        properties.forEach { k, v ->
+        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
-            it[k] = v
+
-        }
+        // publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
     }
 }

lib/build.gradle

@@ -4,5 +4,5 @@ plugins {
     id "com.android.library"
 }
 
-apply from: "$mppProjectWithSerialization"
+apply from: "$mppProjectWithSerializationPresetPath"
 

mppAndroidProject.gradle

@@ -36,4 +36,4 @@ kotlin {
     }
 }
 
-apply from: "$defaultAndroidSettings"
+apply from: "$defaultAndroidSettingsPresetPath"

mppProjectWithSerialization.gradle

@@ -62,4 +62,4 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-apply from: "$defaultAndroidSettings"
+apply from: "$defaultAndroidSettingsPresetPath"