From 8f81904cdbcf5efd37e11096462603746fab4796 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 17 Jan 2024 19:35:06 +0600 Subject: [PATCH] update templates --- .templates/mpp_android_module/ModuleGenerator.json | 6 +++--- .../build.gradle | 0 .../src/androidMain/kotlin/PackageInfo.kt | 0 .../src/commonMain/kotlin/PackageInfo.kt | 0 .templates/mpp_java_module/ModuleGenerator.json | 6 +++--- .../build.gradle | 0 .../src/commonMain/kotlin/PackageInfo.kt | 0 .../src/jvmMain/kotlin/JvmPackageInfo.kt | 0 .templates/mpp_js_module/ModuleGenerator.json | 6 +++--- .../build.gradle | 0 .../src/commonMain/kotlin/PackageInfo.kt | 0 .../src/jsMain/kotlin/JsPackageInfo.kt | 0 .templates/mpp_module/ModuleGenerator.json | 6 +++--- .../build.gradle | 0 .../src/androidMain}/kotlin/PackageInfo.kt | 0 .../src/commonMain/kotlin/PackageInfo.kt | 1 + .../src/androidMain/AndroidManifest.xml | 1 - 17 files changed, 13 insertions(+), 13 deletions(-) rename .templates/mpp_android_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/build.gradle (100%) rename .templates/mpp_android_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/androidMain/kotlin/PackageInfo.kt (100%) rename .templates/mpp_android_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/commonMain/kotlin/PackageInfo.kt (100%) rename .templates/mpp_java_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/build.gradle (100%) rename .templates/mpp_java_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/commonMain/kotlin/PackageInfo.kt (100%) rename .templates/mpp_java_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/jvmMain/kotlin/JvmPackageInfo.kt (100%) rename .templates/mpp_js_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/build.gradle (100%) rename .templates/mpp_js_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/commonMain/kotlin/PackageInfo.kt (100%) rename .templates/mpp_js_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/src/jsMain/kotlin/JsPackageInfo.kt (100%) rename .templates/mpp_module/{{{.module_path.lowercase()}} => {{.module_name.lowercase()}}}/build.gradle (100%) rename .templates/mpp_module/{{{.module_path.lowercase()}}/src/commonMain => {{.module_name.lowercase()}}/src/androidMain}/kotlin/PackageInfo.kt (100%) create mode 100644 .templates/mpp_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt delete mode 100644 .templates/mpp_module/{{.module_path.lowercase()}}/src/androidMain/AndroidManifest.xml diff --git a/.templates/mpp_android_module/ModuleGenerator.json b/.templates/mpp_android_module/ModuleGenerator.json index 98a38a3..f18111d 100644 --- a/.templates/mpp_android_module/ModuleGenerator.json +++ b/.templates/mpp_android_module/ModuleGenerator.json @@ -1,5 +1,5 @@ { - "module_path": "feature/sample", - "module_package": "{{.module_path.replace(\"/\", \".\")}}", - "full_module_package": "project_group.{{.module_path.replace(\"/\", \".\")}}" + "module_name": "sample", + "module_package": "feature.{{.module_name}}", + "full_module_package": "project_group.project_name.{{.module_package}}" } diff --git a/.templates/mpp_android_module/{{.module_path.lowercase()}}/build.gradle b/.templates/mpp_android_module/{{.module_name.lowercase()}}/build.gradle similarity index 100% rename from .templates/mpp_android_module/{{.module_path.lowercase()}}/build.gradle rename to .templates/mpp_android_module/{{.module_name.lowercase()}}/build.gradle diff --git a/.templates/mpp_android_module/{{.module_path.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt b/.templates/mpp_android_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt similarity index 100% rename from .templates/mpp_android_module/{{.module_path.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt rename to .templates/mpp_android_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt diff --git a/.templates/mpp_android_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt b/.templates/mpp_android_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt similarity index 100% rename from .templates/mpp_android_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt rename to .templates/mpp_android_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt diff --git a/.templates/mpp_java_module/ModuleGenerator.json b/.templates/mpp_java_module/ModuleGenerator.json index 98a38a3..f18111d 100644 --- a/.templates/mpp_java_module/ModuleGenerator.json +++ b/.templates/mpp_java_module/ModuleGenerator.json @@ -1,5 +1,5 @@ { - "module_path": "feature/sample", - "module_package": "{{.module_path.replace(\"/\", \".\")}}", - "full_module_package": "project_group.{{.module_path.replace(\"/\", \".\")}}" + "module_name": "sample", + "module_package": "feature.{{.module_name}}", + "full_module_package": "project_group.project_name.{{.module_package}}" } diff --git a/.templates/mpp_java_module/{{.module_path.lowercase()}}/build.gradle b/.templates/mpp_java_module/{{.module_name.lowercase()}}/build.gradle similarity index 100% rename from .templates/mpp_java_module/{{.module_path.lowercase()}}/build.gradle rename to .templates/mpp_java_module/{{.module_name.lowercase()}}/build.gradle diff --git a/.templates/mpp_java_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt b/.templates/mpp_java_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt similarity index 100% rename from .templates/mpp_java_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt rename to .templates/mpp_java_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt diff --git a/.templates/mpp_java_module/{{.module_path.lowercase()}}/src/jvmMain/kotlin/JvmPackageInfo.kt b/.templates/mpp_java_module/{{.module_name.lowercase()}}/src/jvmMain/kotlin/JvmPackageInfo.kt similarity index 100% rename from .templates/mpp_java_module/{{.module_path.lowercase()}}/src/jvmMain/kotlin/JvmPackageInfo.kt rename to .templates/mpp_java_module/{{.module_name.lowercase()}}/src/jvmMain/kotlin/JvmPackageInfo.kt diff --git a/.templates/mpp_js_module/ModuleGenerator.json b/.templates/mpp_js_module/ModuleGenerator.json index 98a38a3..f18111d 100644 --- a/.templates/mpp_js_module/ModuleGenerator.json +++ b/.templates/mpp_js_module/ModuleGenerator.json @@ -1,5 +1,5 @@ { - "module_path": "feature/sample", - "module_package": "{{.module_path.replace(\"/\", \".\")}}", - "full_module_package": "project_group.{{.module_path.replace(\"/\", \".\")}}" + "module_name": "sample", + "module_package": "feature.{{.module_name}}", + "full_module_package": "project_group.project_name.{{.module_package}}" } diff --git a/.templates/mpp_js_module/{{.module_path.lowercase()}}/build.gradle b/.templates/mpp_js_module/{{.module_name.lowercase()}}/build.gradle similarity index 100% rename from .templates/mpp_js_module/{{.module_path.lowercase()}}/build.gradle rename to .templates/mpp_js_module/{{.module_name.lowercase()}}/build.gradle diff --git a/.templates/mpp_js_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt b/.templates/mpp_js_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt similarity index 100% rename from .templates/mpp_js_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt rename to .templates/mpp_js_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt diff --git a/.templates/mpp_js_module/{{.module_path.lowercase()}}/src/jsMain/kotlin/JsPackageInfo.kt b/.templates/mpp_js_module/{{.module_name.lowercase()}}/src/jsMain/kotlin/JsPackageInfo.kt similarity index 100% rename from .templates/mpp_js_module/{{.module_path.lowercase()}}/src/jsMain/kotlin/JsPackageInfo.kt rename to .templates/mpp_js_module/{{.module_name.lowercase()}}/src/jsMain/kotlin/JsPackageInfo.kt diff --git a/.templates/mpp_module/ModuleGenerator.json b/.templates/mpp_module/ModuleGenerator.json index 98a38a3..f18111d 100644 --- a/.templates/mpp_module/ModuleGenerator.json +++ b/.templates/mpp_module/ModuleGenerator.json @@ -1,5 +1,5 @@ { - "module_path": "feature/sample", - "module_package": "{{.module_path.replace(\"/\", \".\")}}", - "full_module_package": "project_group.{{.module_path.replace(\"/\", \".\")}}" + "module_name": "sample", + "module_package": "feature.{{.module_name}}", + "full_module_package": "project_group.project_name.{{.module_package}}" } diff --git a/.templates/mpp_module/{{.module_path.lowercase()}}/build.gradle b/.templates/mpp_module/{{.module_name.lowercase()}}/build.gradle similarity index 100% rename from .templates/mpp_module/{{.module_path.lowercase()}}/build.gradle rename to .templates/mpp_module/{{.module_name.lowercase()}}/build.gradle diff --git a/.templates/mpp_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt b/.templates/mpp_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt similarity index 100% rename from .templates/mpp_module/{{.module_path.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt rename to .templates/mpp_module/{{.module_name.lowercase()}}/src/androidMain/kotlin/PackageInfo.kt diff --git a/.templates/mpp_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt b/.templates/mpp_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt new file mode 100644 index 0000000..04b059d --- /dev/null +++ b/.templates/mpp_module/{{.module_name.lowercase()}}/src/commonMain/kotlin/PackageInfo.kt @@ -0,0 +1 @@ +package {{.full_module_package}} diff --git a/.templates/mpp_module/{{.module_path.lowercase()}}/src/androidMain/AndroidManifest.xml b/.templates/mpp_module/{{.module_path.lowercase()}}/src/androidMain/AndroidManifest.xml deleted file mode 100644 index ae51a89..0000000 --- a/.templates/mpp_module/{{.module_path.lowercase()}}/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ -