From 72a2e71ffda5d5fe4bc72167e1dec159bf2f6921 Mon Sep 17 00:00:00 2001
From: Neo <c.min.tseng@gmail.com>
Date: Thu, 4 Jun 2026 00:09:51 +0800
Subject: [PATCH 1/2] perf: fix UI freeze in New Project Wizard by moving
 version fetching to async pre-fetch

---
 .../AndroidStudioTemplateProvider.kt          |  14 +++
 .../projectwizard/CMPTemplate.kt              |   9 +-
 .../projectwizard/ComposeTemplate.kt          |   8 --
 .../projectwizard/XMLTemplate.kt              |   8 --
 .../projectwizard/gradle/Version.kt           | 115 ++++++++++--------
 .../gradle/network/GetVersions.kt             |  21 ++--
 6 files changed, 91 insertions(+), 84 deletions(-)

diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/AndroidStudioTemplateProvider.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/AndroidStudioTemplateProvider.kt
index d884cf4c..8ddba7de 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/AndroidStudioTemplateProvider.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/AndroidStudioTemplateProvider.kt
@@ -2,7 +2,21 @@ package com.github.cnrture.quickprojectwizard.projectwizard
 
 import com.android.tools.idea.wizard.template.Template
 import com.android.tools.idea.wizard.template.WizardTemplateProvider
+import com.github.cnrture.quickprojectwizard.projectwizard.gradle.network.getVersions
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 
 class AndroidStudioTemplateProvider : WizardTemplateProvider() {
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    init {
+        // Start fetching versions asynchronously as soon as the provider is initialized
+        scope.launch {
+            getVersions()
+        }
+    }
+
     override fun getTemplates(): List<Template> = listOf(composeMultiplatformTemplate, composeTemplate, xmlTemplate)
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/CMPTemplate.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/CMPTemplate.kt
index c50fbab3..da9b2ec1 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/CMPTemplate.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/CMPTemplate.kt
@@ -13,18 +13,11 @@ val composeMultiplatformTemplate = template {
     name = "QuickProjectWizard - CMP"
     description = "Quickly create a new project with libraries, tools and screens you want."
     minApi = 23
+    constraints = listOf(TemplateConstraint.AndroidX, TemplateConstraint.Kotlin)
     category = Category.Other
     formFactor = FormFactor.Generic
     screens = listOf(WizardUiContext.NewProject, WizardUiContext.NewProjectExtraDetail)
 
-    runBlocking {
-        try {
-            getVersions()
-        } catch (e: Exception) {
-            println("Failed to fetch versions: ${e.message}")
-        }
-    }
-
     val isAndroidEnable = booleanParameter {
         name = "Android"
         default = true
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/ComposeTemplate.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/ComposeTemplate.kt
index 224607e4..ef60981f 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/ComposeTemplate.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/ComposeTemplate.kt
@@ -20,14 +20,6 @@ val composeTemplate = template {
     formFactor = FormFactor.Mobile
     screens = listOf(WizardUiContext.NewProject, WizardUiContext.NewProjectExtraDetail)
 
-    runBlocking {
-        try {
-            getVersions()
-        } catch (e: Exception) {
-            println("Failed to fetch versions: ${e.message}")
-        }
-    }
-
     val projectName = defaultPackageNameParameter.value.split(".").last()
         .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
 
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/XMLTemplate.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/XMLTemplate.kt
index d1188837..93da39c7 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/XMLTemplate.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/XMLTemplate.kt
@@ -19,14 +19,6 @@ val xmlTemplate = template {
     formFactor = FormFactor.Mobile
     screens = listOf(WizardUiContext.NewProject, WizardUiContext.NewProjectExtraDetail)
 
-    runBlocking {
-        try {
-            getVersions()
-        } catch (e: Exception) {
-            println("Failed to fetch versions: ${e.message}")
-        }
-    }
-
     val selectedNetworkLibrary = enumParameter<NetworkLibrary> {
         name = "Network Library"
         default = NetworkLibrary.None
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/Version.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/Version.kt
index 18c4357a..b481ddfd 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/Version.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/Version.kt
@@ -1,58 +1,71 @@
 package com.github.cnrture.quickprojectwizard.projectwizard.gradle
 
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
 object Versions {
-    val versionList = mutableMapOf(
-        "agp" to "8.9.3",
-        "kotlin" to "2.1.21",
-        "core-ktx" to "1.16.0",
-        "junit" to "4.13.2",
-        "junit-ext" to "1.2.1",
-        "espresso-core" to "3.6.1",
-        "appcompat" to "1.7.1",
-        "material" to "1.12.0",
-        "ksp" to "2.1.21-2.0.2",
-        "lifecycle-runtime-ktx" to "2.9.1",
-        "activity-compose" to "1.10.1",
-        "compose-bom" to "2025.06.00",
-        "activity" to "1.10.1",
-        "constraintlayout" to "2.2.1",
-        "coilVersion" to "2.7.0",
-        "glideVersion" to "4.16.0",
-        "glideCompose" to "1.0.0-beta01",
-        "room" to "2.7.1",
-        "retrofit" to "2.11.0",
-        "ktor" to "3.0.1",
-        "hilt" to "2.55",
-        "hiltNavigationCompose" to "1.2.0",
-        "koin" to "4.0.1",
-        "koinCompose" to "4.0.1",
-        "navigation" to "2.9.0",
-        "kotlinXSerialization" to "1.8.1",
-        "ktlint" to "11.3.2",
-        "detekt" to "1.23.6",
-        "googleServices" to "4.4.2",
-        "firebase" to "33.15.0",
-        "workManagerVersion" to "2.10.1",
-        "fragment-ktx" to "1.8.8",
-        "cmp-agp" to "8.5.2",
-        "cmp-kotlin" to "2.1.0",
-        "cmp-activity-compose" to "1.9.3",
-        "cmp-ui-tooling" to "1.7.6",
-        "cmp-multiplatform" to "1.7.0-beta02",
-        "cmp-koin" to "4.0.0",
-        "cmp-ktor" to "3.0.1",
-        "cmp-navigation" to "2.8.0-alpha08",
-        "cmp-kotlinx-coroutines" to "1.9.0",
-        "cmp-coil" to "3.0.0-alpha06",
-        "cmp-kamel" to "0.9.5",
-        "cmp-ksp" to "2.1.21-2.0.2",
-        "cmp-room" to "2.7.0-alpha08",
-        "cmp-sqlite" to "2.5.0-SNAPSHOT",
-        "cmp-kotlinx-serialization" to "1.7.3",
-        "ktorfit" to "2.7.2",
-        "koin" to "4.1.1",
-        "koin-compose" to "4.1.1",
+    private val _versionListState = MutableStateFlow(
+        mutableMapOf(
+            "agp" to "8.9.3",
+            "kotlin" to "2.1.21",
+            "core-ktx" to "1.16.0",
+            "junit" to "4.13.2",
+            "junit-ext" to "1.2.1",
+            "espresso-core" to "3.6.1",
+            "appcompat" to "1.7.1",
+            "material" to "1.12.0",
+            "ksp" to "2.1.21-2.0.2",
+            "lifecycle-runtime-ktx" to "2.9.1",
+            "activity-compose" to "1.10.1",
+            "compose-bom" to "2025.06.00",
+            "activity" to "1.10.1",
+            "constraintlayout" to "2.2.1",
+            "coilVersion" to "2.7.0",
+            "glideVersion" to "4.16.0",
+            "glideCompose" to "1.0.0-beta01",
+            "room" to "2.7.1",
+            "retrofit" to "2.11.0",
+            "ktor" to "3.0.1",
+            "hilt" to "2.55",
+            "hiltNavigationCompose" to "1.2.0",
+            "koin" to "4.0.1",
+            "koinCompose" to "4.0.1",
+            "navigation" to "2.9.0",
+            "kotlinXSerialization" to "1.8.1",
+            "ktlint" to "11.3.2",
+            "detekt" to "1.23.6",
+            "googleServices" to "4.4.2",
+            "firebase" to "33.15.0",
+            "workManagerVersion" to "2.10.1",
+            "fragment-ktx" to "1.8.8",
+            "cmp-agp" to "8.5.2",
+            "cmp-kotlin" to "2.1.0",
+            "cmp-activity-compose" to "1.9.3",
+            "cmp-ui-tooling" to "1.7.6",
+            "cmp-multiplatform" to "1.7.0-beta02",
+            "cmp-koin" to "4.0.0",
+            "cmp-ktor" to "3.0.1",
+            "cmp-navigation" to "2.8.0-alpha08",
+            "cmp-kotlinx-coroutines" to "1.9.0",
+            "cmp-coil" to "3.0.0-alpha06",
+            "cmp-kamel" to "0.9.5",
+            "cmp-ksp" to "2.1.21-2.0.2",
+            "cmp-room" to "2.7.0-alpha08",
+            "cmp-sqlite" to "2.5.0-SNAPSHOT",
+            "cmp-kotlinx-serialization" to "1.7.3",
+            "ktorfit" to "2.7.2",
+            "koin" to "4.1.1",
+            "koin-compose" to "4.1.1",
+        )
     )
+    val versionListState = _versionListState.asStateFlow()
+    val versionList get() = _versionListState.value
+
+    fun updateVersions(newVersions: Map<String, String>) {
+        val current = _versionListState.value.toMutableMap()
+        current.putAll(newVersions)
+        _versionListState.value = current
+    }
 }
 
 sealed class Version(val name: String, val value: String) {
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/network/GetVersions.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/network/GetVersions.kt
index 9cafb166..1c56f263 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/network/GetVersions.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/network/GetVersions.kt
@@ -9,15 +9,18 @@ import io.ktor.client.statement.*
 import kotlinx.serialization.json.Json
 
 suspend fun getVersions() {
-    val client = HttpClient(CIO) {
-        this.engine {
-            requestTimeout = 5000
+    try {
+        val client = HttpClient(CIO) {
+            this.engine {
+                requestTimeout = 5000
+            }
         }
+        val response: HttpResponse = client.get("https://api.canerture.com/qpwizard/versions")
+        val versions = Json.decodeFromString<List<VersionModel>>(response.bodyAsText())
+        val newVersionsMap = versions.associate { it.name to it.value }
+        Versions.updateVersions(newVersionsMap)
+        client.close()
+    } catch (e: Exception) {
+        println("Failed to fetch versions: ${e.message}")
     }
-    val response: HttpResponse = client.get("https://api.canerture.com/qpwizard/versions")
-    val versions = Json.decodeFromString<List<VersionModel>>(response.bodyAsText())
-    versions.forEach {
-        Versions.versionList[it.name] = it.value
-    }
-    client.close()
 }
\ No newline at end of file

From 00828b5eadaa16793f04b4d9846a8ea25ba5d6fa Mon Sep 17 00:00:00 2001
From: Neo <c.min.tseng@gmail.com>
Date: Thu, 4 Jun 2026 00:10:41 +0800
Subject: [PATCH 2/2] fix: resolve Gradle Groovy/KTS compatibility and file
 duplication issues in CMP and XML templates (v1.0.5)

---
 gradle.properties                             |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../quickprojectwizard/common/Extensions.kt   | 133 ++++++++++++-----
 .../quickprojectwizard/common/Utils.kt        |  22 ++-
 .../common/file/FileWriter.kt                 |   5 +
 .../quickprojectwizard/data/CMPConfigModel.kt |   1 +
 .../cmparch/CommonFileGenerator.kt            |   4 +-
 .../projectwizard/gradle/GradleKts.kt         | 137 +++++++++---------
 .../projectwizard/gradle/ProjectGradleKts.kt  |  21 +--
 .../ComposeMultiplatformProjectRecipe.kt      |  45 +++++-
 .../recipes/ComposeProjectRecipe.kt           |  59 ++++----
 .../projectwizard/recipes/XMLProjectRecipe.kt |  84 ++++-------
 .../toolwindow/template/GradleTemplate.kt     |  51 +++++--
 .../toolwindow/template/TemplateWriter.kt     |   7 +-
 .../code/gradle_wrapper.properties.ft         |   2 +-
 .../code/project_build.gradle.kts.ft          |  16 +-
 .../fileTemplates/code/settings.gradle.kts.ft |   8 +
 17 files changed, 364 insertions(+), 235 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e1392dc6..13b41ca1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ platformPlugins =
 platformBundledPlugins = org.jetbrains.android, org.jetbrains.kotlin, com.intellij.java
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.13.2
+gradleVersion=9.4.1
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f78a6a..c61a118f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Extensions.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Extensions.kt
index 4f42039c..ae18b053 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Extensions.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Extensions.kt
@@ -57,50 +57,86 @@ fun StringBuilder.addLibsPlugin(plugin: Plugin) {
     append("${plugin.name} = { id = \"${plugin.id}\", version.ref = \"${plugin.verRef}\" }\n")
 }
 
-fun StringBuilder.addGradlePlugin(plugin: Plugin, isProject: Boolean = false) {
+fun StringBuilder.addGradlePlugin(plugin: Plugin, isProject: Boolean = false, isKts: Boolean = true) {
     val name = plugin.name.replace("-", ".")
-    val lastPath = if (isProject) " apply false" else ""
-    append("    alias(libs.plugins.$name)$lastPath\n")
+    val lastPath = if (isProject) (if (isKts) " apply false" else " apply false") else ""
+    if (isKts) {
+        append("    alias(libs.plugins.$name)$lastPath\n")
+    } else {
+        append("    alias libs.plugins.$name$lastPath\n")
+    }
 }
 
-fun StringBuilder.addGradleImplementation(library: Library) {
+fun StringBuilder.addGradleImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    implementation(libs.$name)\n")
+    if (isKts) {
+        append("    implementation(libs.$name)\n")
+    } else {
+        append("    implementation libs.$name\n")
+    }
 }
 
-fun StringBuilder.addGradleDetektImplementation(library: Library) {
+fun StringBuilder.addGradleDetektImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    detektPlugins(libs.$name)\n")
+    if (isKts) {
+        append("    detektPlugins(libs.$name)\n")
+    } else {
+        append("    detektPlugins libs.$name\n")
+    }
 }
 
-fun StringBuilder.addGradlePlatformImplementation(library: Library) {
+fun StringBuilder.addGradlePlatformImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    implementation(platform(libs.$name))\n")
+    if (isKts) {
+        append("    implementation(platform(libs.$name))\n")
+    } else {
+        append("    implementation platform(libs.$name)\n")
+    }
 }
 
-fun StringBuilder.addGradleTestImplementation(library: Library) {
+fun StringBuilder.addGradleTestImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    testImplementation(libs.$name)\n")
+    if (isKts) {
+        append("    testImplementation(libs.$name)\n")
+    } else {
+        append("    testImplementation libs.$name\n")
+    }
 }
 
-fun StringBuilder.addGradleAndroidTestImplementation(library: Library) {
+fun StringBuilder.addGradleAndroidTestImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    androidTestImplementation(libs.$name)\n")
+    if (isKts) {
+        append("    androidTestImplementation(libs.$name)\n")
+    } else {
+        append("    androidTestImplementation libs.$name\n")
+    }
 }
 
-fun StringBuilder.addGradleAndroidTestPlatformImplementation(library: Library) {
+fun StringBuilder.addGradleAndroidTestPlatformImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    androidTestImplementation(platform(libs.$name))\n")
+    if (isKts) {
+        append("    androidTestImplementation(platform(libs.$name))\n")
+    } else {
+        append("    androidTestImplementation platform(libs.$name)\n")
+    }
 }
 
-fun StringBuilder.addGradleDebugImplementation(library: Library) {
+fun StringBuilder.addGradleDebugImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    debugImplementation(libs.$name)\n")
+    if (isKts) {
+        append("    debugImplementation(libs.$name)\n")
+    } else {
+        append("    debugImplementation libs.$name\n")
+    }
 }
 
-fun StringBuilder.addKspImplementation(library: Library) {
+fun StringBuilder.addKspImplementation(library: Library, isKts: Boolean = true) {
     val name = library.libName.replace("-", ".")
-    append("    ksp(libs.$name)\n")
+    if (isKts) {
+        append("    ksp(libs.$name)\n")
+    } else {
+        append("    ksp libs.$name\n")
+    }
 }
 
 fun StringBuilder.addDetektBlock() {
@@ -113,23 +149,40 @@ fun StringBuilder.addDetektBlock() {
     append("}\n")
 }
 
-fun StringBuilder.addAndroidBlock(packageName: String, minApi: Int, javaJvmVersion: String, isCompose: Boolean) {
+fun StringBuilder.addAndroidBlock(
+    packageName: String,
+    minApi: Int,
+    javaJvmVersion: String,
+    isCompose: Boolean,
+    isKts: Boolean = true
+) {
+    val assignment = if (isKts) " = " else " "
     append("android {\n")
-    append("    namespace = \"${packageName}\"\n")
-    append("    compileSdk = 36\n\n")
-    append("    android.buildFeatures.buildConfig = true\n\n")
+    append("    namespace${assignment}\"${packageName}\"\n")
+    append("    compileSdk${assignment}36\n\n")
+    if (isKts) {
+        append("    android.buildFeatures.buildConfig = true\n\n")
+    } else {
+        append("    buildFeatures {\n")
+        append("        buildConfig true\n")
+        append("    }\n\n")
+    }
     append("    defaultConfig {\n")
-    append("        applicationId = \"${packageName}\"\n")
-    append("        minSdk = $minApi\n")
-    append("        targetSdk = 36\n")
-    append("        versionCode = 1\n")
-    append("        versionName = \"1.0\"\n\n")
-    append("        testInstrumentationRunner = \"androidx.test.runner.AndroidJUnitRunner\"\n")
-    append("        vectorDrawables.useSupportLibrary = true\n")
+    append("        applicationId${assignment}\"${packageName}\"\n")
+    append("        minSdk${assignment}$minApi\n")
+    append("        targetSdk${assignment}36\n")
+    append("        versionCode${assignment}1\n")
+    append("        versionName${assignment}\"1.0\"\n\n")
+    append("        testInstrumentationRunner${assignment}\"androidx.test.runner.AndroidJUnitRunner\"\n")
+    if (isKts) {
+        append("        vectorDrawables.useSupportLibrary = true\n")
+    } else {
+        append("        vectorDrawables.useSupportLibrary true\n")
+    }
     append("    }\n\n")
     append("    buildTypes {\n")
     append("        release {\n")
-    append("            isMinifyEnabled = false\n")
+    append("            isMinifyEnabled${assignment}false\n")
     append("            proguardFiles(\n")
     append("                getDefaultProguardFile(\"proguard-android-optimize.txt\"),\n")
     append("                \"proguard-rules.pro\"\n")
@@ -137,14 +190,20 @@ fun StringBuilder.addAndroidBlock(packageName: String, minApi: Int, javaJvmVersi
     append("        }\n")
     append("    }\n")
     append("    compileOptions {\n")
-    append("        sourceCompatibility = JavaVersion.VERSION_$javaJvmVersion\n")
-    append("        targetCompatibility = JavaVersion.VERSION_$javaJvmVersion\n")
-    append("    }\n")
-    append("    kotlin {\n")
-    append("        compilerOptions.jvmTarget.set(JvmTarget.JVM_$javaJvmVersion)\n")
+    append("        sourceCompatibility${assignment}JavaVersion.VERSION_$javaJvmVersion\n")
+    append("        targetCompatibility${assignment}JavaVersion.VERSION_$javaJvmVersion\n")
     append("    }\n")
+    if (isKts) {
+        append("    kotlin {\n")
+        append("        compilerOptions.jvmTarget.set(JvmTarget.JVM_$javaJvmVersion)\n")
+        append("    }\n")
+    } else {
+        append("    kotlinOptions {\n")
+        append("        jvmTarget = '$javaJvmVersion'\n")
+        append("    }\n")
+    }
     append("    buildFeatures {\n")
-    if (isCompose) append("        compose = true\n") else append("        viewBinding = true\n")
+    if (isCompose) append("        compose${assignment}true\n") else append("        viewBinding${assignment}true\n")
     append("    }\n")
     append("    packaging {\n")
     append("        resources {\n")
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Utils.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Utils.kt
index d8030f66..c9b72b52 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Utils.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/Utils.kt
@@ -653,17 +653,25 @@ object Utils {
         outputDir: VirtualFile,
         asset: GeneratorTemplateFile,
     ) {
-        Configuration(Configuration.VERSION_2_3_33).apply {
+        val content = processTemplate(dataModel, asset)
+        val outputFilePathParts = asset.relativePath.split('/')
+        val dirPath = outputFilePathParts.dropLast(1).joinToString("/")
+        val targetDir = VfsUtil.createDirectoryIfMissing(outputDir, dirPath)
+            ?: throw IOException("Failed to create directory: $dirPath")
+        val outputFile = targetDir.createChildData(this, outputFilePathParts.last())
+        VfsUtil.saveText(outputFile, content)
+    }
+
+    fun processTemplate(
+        dataModel: Map<String, Any>,
+        asset: GeneratorTemplateFile,
+    ): String {
+        return Configuration(Configuration.VERSION_2_3_33).run {
             setClassLoaderForTemplateLoading(this::class.java.classLoader, "fileTemplates/code")
-            val outputFilePathParts = asset.relativePath.split('/')
-            val dirPath = outputFilePathParts.dropLast(1).joinToString("/")
-            val targetDir = VfsUtil.createDirectoryIfMissing(outputDir, dirPath)
-                ?: throw IOException("Failed to create directory: $dirPath")
-            val outputFile = targetDir.createChildData(this, outputFilePathParts.last())
             StringWriter().use { writer ->
                 val template = "${asset.template.name}.${asset.template.extension}"
                 getTemplate("${template}.ft").process(dataModel, writer)
-                VfsUtil.saveText(outputFile, writer.toString())
+                writer.toString()
             }
         }
     }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/file/FileWriter.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/file/FileWriter.kt
index 0b55df15..7cfe1b24 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/file/FileWriter.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/common/file/FileWriter.kt
@@ -52,6 +52,8 @@ class FileWriter() {
             modulePathAsString = modulePathAsString,
         )
 
+        val isKts = settingsGradleFile.name.endsWith(".kts")
+
         filesCreated += createDefaultModuleStructure(
             packageName = packageName,
             moduleFile = moduleFile,
@@ -62,6 +64,7 @@ class FileWriter() {
             libraryDependencies = libraryDependencies,
             pluginDependencies = pluginDependencies,
             template = template,
+            isKts = isKts,
         )
 
         showSuccessDialog()
@@ -79,6 +82,7 @@ class FileWriter() {
         libraryDependencies: String = Constants.EMPTY,
         pluginDependencies: String = Constants.EMPTY,
         template: ModuleTemplate? = null,
+        isKts: Boolean = true,
     ): List<File> {
         val filesCreated = mutableListOf<File>()
 
@@ -89,6 +93,7 @@ class FileWriter() {
             dependencies = dependencies,
             libraryDependencies = libraryDependencies,
             pluginDependencies = pluginDependencies,
+            isKts = isKts,
         )
 
         if (moduleType == Constants.ANDROID) {
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/data/CMPConfigModel.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/data/CMPConfigModel.kt
index 39c36921..bce66620 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/data/CMPConfigModel.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/data/CMPConfigModel.kt
@@ -18,6 +18,7 @@ class CMPConfigModel : WizardModel() {
     var isDataDomainDiUiEnable: Boolean by mutableStateOf(false)
     var screens: List<String> by mutableStateOf(emptyList())
     var packageName by mutableStateOf("")
+    var isKts: Boolean by mutableStateOf(true)
 
     override fun handleFinished() = Unit
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/cmparch/CommonFileGenerator.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/cmparch/CommonFileGenerator.kt
index 5d5714e3..f03e0bc5 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/cmparch/CommonFileGenerator.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/cmparch/CommonFileGenerator.kt
@@ -23,11 +23,11 @@ class CommonFileGenerator(
                         ftManager.getCodeTemplate(Template.IDEA_WORKSPACE)
                     ),
                     GeneratorTemplateFile(
-                        "build.gradle.kts",
+                        if (params.isKts) "build.gradle.kts" else "build.gradle",
                         ftManager.getCodeTemplate(Template.GRADLE_KTS)
                     ),
                     GeneratorTemplateFile(
-                        "settings.gradle.kts",
+                        if (params.isKts) "settings.gradle.kts" else "settings.gradle",
                         ftManager.getCodeTemplate(Template.SETTINGS_GRADLE)
                     ),
                     GeneratorTemplateFile(
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/GradleKts.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/GradleKts.kt
index 5f0e86b1..cfcfc62a 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/GradleKts.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/GradleKts.kt
@@ -19,74 +19,75 @@ fun getGradleKts(
     packagePath: String,
     minApi: Int,
     javaJvmVersion: String,
+    isKts: Boolean = true
 ) = StringBuilder().apply {
     val isHiltEnable = selectedDILibrary == DILibrary.Hilt
     val isKoinEnable = selectedDILibrary == DILibrary.Koin
     val isKtorfitEnable = selectedNetworkLibrary == NetworkLibrary.Ktorfit
     val isKtorEnable = selectedNetworkLibrary == NetworkLibrary.Ktor
-    append("import org.jetbrains.kotlin.gradle.dsl.JvmTarget\n\n")
+    if (isKts) append("import org.jetbrains.kotlin.gradle.dsl.JvmTarget\n\n")
     append("plugins {\n")
-    addGradlePlugin(Plugin.AndroidApplication)
-    addGradlePlugin(Plugin.JetbrainsKotlinAndroid)
-    if (isCompose) addGradlePlugin(Plugin.ComposeCompiler)
+    addGradlePlugin(Plugin.AndroidApplication, isKts = isKts)
+    addGradlePlugin(Plugin.JetbrainsKotlinAndroid, isKts = isKts)
+    if (isCompose) addGradlePlugin(Plugin.ComposeCompiler, isKts = isKts)
     if (isHiltEnable || isRoomEnable || selectedImageLibrary == ImageLibrary.Glide || isKtorfitEnable) addGradlePlugin(
-        Plugin.Ksp
+        Plugin.Ksp, isKts = isKts
     )
-    if (isHiltEnable) addGradlePlugin(Plugin.Hilt)
-    if (isKtLintEnable) addGradlePlugin(Plugin.KtLint)
-    if (isDetektEnable) addGradlePlugin(Plugin.Detekt)
-    if (isFirebaseEnable) addGradlePlugin(Plugin.GoogleServices)
-    if (!isCompose && isNavigationEnable) addGradlePlugin(Plugin.NavigationSafeArgs)
-    if ((isNavigationEnable && isCompose) || isKtorEnable || isKtorfitEnable) addGradlePlugin(Plugin.KotlinxSerialization)
+    if (isHiltEnable) addGradlePlugin(Plugin.Hilt, isKts = isKts)
+    if (isKtLintEnable) addGradlePlugin(Plugin.KtLint, isKts = isKts)
+    if (isDetektEnable) addGradlePlugin(Plugin.Detekt, isKts = isKts)
+    if (isFirebaseEnable) addGradlePlugin(Plugin.GoogleServices, isKts = isKts)
+    if (!isCompose && isNavigationEnable) addGradlePlugin(Plugin.NavigationSafeArgs, isKts = isKts)
+    if ((isNavigationEnable && isCompose) || isKtorEnable || isKtorfitEnable) addGradlePlugin(Plugin.KotlinxSerialization, isKts = isKts)
     append("}\n\n")
 
-    addAndroidBlock(packagePath, minApi, javaJvmVersion, isCompose)
+    addAndroidBlock(packagePath, minApi, javaJvmVersion, isCompose, isKts = isKts)
 
     append("dependencies {\n\n")
-    addDefaultDependencies()
+    addDefaultDependencies(isKts)
 
     if (isCompose) {
-        addComposeDependencies()
+        addComposeDependencies(isKts)
     } else {
-        addGradleImplementation(Library.Activity)
-        addGradleImplementation(Library.ConstraintLayout)
-        addGradleImplementation(Library.FragmentKtx)
+        addGradleImplementation(Library.Activity, isKts = isKts)
+        addGradleImplementation(Library.ConstraintLayout, isKts = isKts)
+        addGradleImplementation(Library.FragmentKtx, isKts = isKts)
     }
 
     if (isRoomEnable) {
         append("\n")
         append("    // Room\n")
-        addKspImplementation(Library.RoomCompiler)
-        addGradleImplementation(Library.RoomRuntime)
-        addGradleImplementation(Library.RoomKtx)
+        addKspImplementation(Library.RoomCompiler, isKts = isKts)
+        addGradleImplementation(Library.RoomRuntime, isKts = isKts)
+        addGradleImplementation(Library.RoomKtx, isKts = isKts)
     }
 
     when (selectedNetworkLibrary) {
         NetworkLibrary.Retrofit -> {
             append("\n")
             append("    // Retrofit\n")
-            addGradleImplementation(Library.Retrofit)
-            addGradleImplementation(Library.ConverterGson)
+            addGradleImplementation(Library.Retrofit, isKts = isKts)
+            addGradleImplementation(Library.ConverterGson, isKts = isKts)
         }
 
         NetworkLibrary.Ktor -> {
             append("\n")
             append("    // Ktor\n")
-            addGradleImplementation(Library.KtorClientCore)
-            addGradleImplementation(Library.KtorClientOkHttp)
-            addGradleImplementation(Library.KtorContentNegotiation)
-            addGradleImplementation(Library.KtorSerialization)
+            addGradleImplementation(Library.KtorClientCore, isKts = isKts)
+            addGradleImplementation(Library.KtorClientOkHttp, isKts = isKts)
+            addGradleImplementation(Library.KtorContentNegotiation, isKts = isKts)
+            addGradleImplementation(Library.KtorSerialization, isKts = isKts)
         }
 
         NetworkLibrary.Ktorfit -> {
             append("\n")
             append("    // Ktorfit\n")
-            addGradleImplementation(Library.Ktorfit)
-            addKspImplementation(Library.KtorfitKsp)
-            addGradleImplementation(Library.KtorClientCore)
-            addGradleImplementation(Library.KtorClientOkHttp)
-            addGradleImplementation(Library.KtorContentNegotiation)
-            addGradleImplementation(Library.KtorSerialization)
+            addGradleImplementation(Library.Ktorfit, isKts = isKts)
+            addKspImplementation(Library.KtorfitKsp, isKts = isKts)
+            addGradleImplementation(Library.KtorClientCore, isKts = isKts)
+            addGradleImplementation(Library.KtorClientOkHttp, isKts = isKts)
+            addGradleImplementation(Library.KtorContentNegotiation, isKts = isKts)
+            addGradleImplementation(Library.KtorSerialization, isKts = isKts)
         }
 
         else -> Unit
@@ -95,30 +96,30 @@ fun getGradleKts(
     if (isHiltEnable) {
         append("\n")
         append("    // Hilt\n")
-        addKspImplementation(Library.HiltCompiler)
-        addGradleImplementation(Library.HiltAndroid)
-        if (isCompose) addGradleImplementation(Library.HiltNavigationCompose)
+        addKspImplementation(Library.HiltCompiler, isKts = isKts)
+        addGradleImplementation(Library.HiltAndroid, isKts = isKts)
+        if (isCompose) addGradleImplementation(Library.HiltNavigationCompose, isKts = isKts)
     }
 
     if (isKoinEnable) {
         append("\n")
         append("    // Koin\n")
-        addGradleImplementation(Library.KoinAndroid)
-        if (isCompose) addGradleImplementation(Library.KoinCompose)
+        addGradleImplementation(Library.KoinAndroid, isKts = isKts)
+        if (isCompose) addGradleImplementation(Library.KoinCompose, isKts = isKts)
     }
 
     if (isNavigationEnable) {
         append("\n")
         append("    // Navigation\n")
-        if (isCompose) addGradleImplementation(Library.NavigationCompose)
+        if (isCompose) addGradleImplementation(Library.NavigationCompose, isKts = isKts)
         else {
-            addGradleImplementation(Library.NavigationFragment)
-            addGradleImplementation(Library.NavigationUi)
+            addGradleImplementation(Library.NavigationFragment, isKts = isKts)
+            addGradleImplementation(Library.NavigationUi, isKts = isKts)
         }
         if (isCompose) {
             append("\n")
             append("    // Kotlinx Serialization\n")
-            addGradleImplementation(Library.KotlinxSerialization)
+            addGradleImplementation(Library.KotlinxSerialization, isKts = isKts)
         }
     }
 
@@ -126,25 +127,25 @@ fun getGradleKts(
         isCompose && selectedImageLibrary == ImageLibrary.Coil -> {
             append("\n")
             append("    // Coil\n")
-            addGradleImplementation(Library.CoilCompose)
+            addGradleImplementation(Library.CoilCompose, isKts = isKts)
         }
 
         isCompose && selectedImageLibrary == ImageLibrary.Glide -> {
             append("\n")
             append("    // Glide\n")
-            addGradleImplementation(Library.GlideCompose)
+            addGradleImplementation(Library.GlideCompose, isKts = isKts)
         }
 
         !isCompose && selectedImageLibrary == ImageLibrary.Coil -> {
             append("\n")
             append("    // Coil\n")
-            addGradleImplementation(Library.Coil)
+            addGradleImplementation(Library.Coil, isKts = isKts)
         }
 
         !isCompose && selectedImageLibrary == ImageLibrary.Glide -> {
             append("\n")
             append("    // Glide\n")
-            addGradleImplementation(Library.Glide)
+            addGradleImplementation(Library.Glide, isKts = isKts)
         }
 
         else -> Unit
@@ -153,43 +154,43 @@ fun getGradleKts(
     if (isDetektEnable) {
         append("\n")
         append("    // Detekt\n")
-        addGradleDetektImplementation(Library.Detekt)
+        addGradleDetektImplementation(Library.Detekt, isKts = isKts)
     }
     if (isFirebaseEnable) {
         append("\n")
         append("    // Firebase\n")
-        addGradlePlatformImplementation(Library.Firebase)
+        addGradlePlatformImplementation(Library.Firebase, isKts = isKts)
     }
     if (isWorkManagerEnable) {
         append("\n")
         append("    // WorkManager\n")
-        addGradleImplementation(Library.WorkManager)
+        addGradleImplementation(Library.WorkManager, isKts = isKts)
     }
     append("}\n")
 
     if (isDetektEnable) addDetektBlock()
 }
 
-private fun StringBuilder.addDefaultDependencies() {
-    addGradleImplementation(Library.CoreKtx)
-    addGradleImplementation(Library.AppCompat)
-    addGradleImplementation(Library.Material)
-    addGradleTestImplementation(Library.Junit)
-    addGradleAndroidTestImplementation(Library.JunitExt)
-    addGradleAndroidTestImplementation(Library.EspressoCore)
-    addGradleImplementation(Library.LifecycleRuntimeKtx)
+private fun StringBuilder.addDefaultDependencies(isKts: Boolean) {
+    addGradleImplementation(Library.CoreKtx, isKts = isKts)
+    addGradleImplementation(Library.AppCompat, isKts = isKts)
+    addGradleImplementation(Library.Material, isKts = isKts)
+    addGradleTestImplementation(Library.Junit, isKts = isKts)
+    addGradleAndroidTestImplementation(Library.JunitExt, isKts = isKts)
+    addGradleAndroidTestImplementation(Library.EspressoCore, isKts = isKts)
+    addGradleImplementation(Library.LifecycleRuntimeKtx, isKts = isKts)
 }
 
-private fun StringBuilder.addComposeDependencies() {
-    addGradleImplementation(Library.LifecycleRuntimeCompose)
-    addGradleImplementation(Library.ActivityCompose)
-    addGradlePlatformImplementation(Library.ComposeBom)
-    addGradleImplementation(Library.ComposeUi)
-    addGradleImplementation(Library.ComposeUiGraphics)
-    addGradleImplementation(Library.ComposeUiToolingPreview)
-    addGradleImplementation(Library.Material3)
-    addGradleAndroidTestPlatformImplementation(Library.ComposeBom)
-    addGradleAndroidTestImplementation(Library.ComposeUiTestJunit4)
-    addGradleDebugImplementation(Library.ComposeUiTooling)
-    addGradleDebugImplementation(Library.ComposeUiTestManifest)
+private fun StringBuilder.addComposeDependencies(isKts: Boolean) {
+    addGradleImplementation(Library.LifecycleRuntimeCompose, isKts = isKts)
+    addGradleImplementation(Library.ActivityCompose, isKts = isKts)
+    addGradlePlatformImplementation(Library.ComposeBom, isKts = isKts)
+    addGradleImplementation(Library.ComposeUi, isKts = isKts)
+    addGradleImplementation(Library.ComposeUiGraphics, isKts = isKts)
+    addGradleImplementation(Library.ComposeUiToolingPreview, isKts = isKts)
+    addGradleImplementation(Library.Material3, isKts = isKts)
+    addGradleAndroidTestPlatformImplementation(Library.ComposeBom, isKts = isKts)
+    addGradleAndroidTestImplementation(Library.ComposeUiTestJunit4, isKts = isKts)
+    addGradleDebugImplementation(Library.ComposeUiTooling, isKts = isKts)
+    addGradleDebugImplementation(Library.ComposeUiTestManifest, isKts = isKts)
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/ProjectGradleKts.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/ProjectGradleKts.kt
index b832fecf..050968e7 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/ProjectGradleKts.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/gradle/ProjectGradleKts.kt
@@ -13,19 +13,20 @@ fun getProjectGradleKts(
     isFirebaseEnable: Boolean,
     isNavigationEnable: Boolean,
     selectedImageLibrary: ImageLibrary,
+    isKts: Boolean = true
 ) = StringBuilder().apply {
     val isHiltEnable = selectedDILibrary == DILibrary.Hilt
     append("// Top-level build file where you can add configuration options common to all sub-projects/modules.\n")
     append("plugins {\n")
-    addGradlePlugin(Plugin.AndroidApplication, true)
-    addGradlePlugin(Plugin.JetbrainsKotlinAndroid, true)
-    if (isCompose) addGradlePlugin(Plugin.ComposeCompiler, true)
-    if (isHiltEnable || isRoomEnable || selectedImageLibrary == ImageLibrary.Glide) addGradlePlugin(Plugin.Ksp, true)
-    if (isHiltEnable) addGradlePlugin(Plugin.Hilt, true)
-    if (isKtLintEnable) addGradlePlugin(Plugin.KtLint, true)
-    if (isDetektEnable) addGradlePlugin(Plugin.Detekt, true)
-    if (isFirebaseEnable) addGradlePlugin(Plugin.GoogleServices, true)
-    if (!isCompose && isNavigationEnable) addGradlePlugin(Plugin.NavigationSafeArgs, true)
-    if (isNavigationEnable && isCompose) addGradlePlugin(Plugin.KotlinxSerialization, true)
+    addGradlePlugin(Plugin.AndroidApplication, isProject = true, isKts = isKts)
+    addGradlePlugin(Plugin.JetbrainsKotlinAndroid, isProject = true, isKts = isKts)
+    if (isCompose) addGradlePlugin(Plugin.ComposeCompiler, isProject = true, isKts = isKts)
+    if (isHiltEnable || isRoomEnable || selectedImageLibrary == ImageLibrary.Glide) addGradlePlugin(Plugin.Ksp, isProject = true, isKts = isKts)
+    if (isHiltEnable) addGradlePlugin(Plugin.Hilt, isProject = true, isKts = isKts)
+    if (isKtLintEnable) addGradlePlugin(Plugin.KtLint, isProject = true, isKts = isKts)
+    if (isDetektEnable) addGradlePlugin(Plugin.Detekt, isProject = true, isKts = isKts)
+    if (isFirebaseEnable) addGradlePlugin(Plugin.GoogleServices, isProject = true, isKts = isKts)
+    if (!isCompose && isNavigationEnable) addGradlePlugin(Plugin.NavigationSafeArgs, isProject = true, isKts = isKts)
+    if (isNavigationEnable && isCompose) addGradlePlugin(Plugin.KotlinxSerialization, isProject = true, isKts = isKts)
     append("}")
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeMultiplatformProjectRecipe.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeMultiplatformProjectRecipe.kt
index 85556f29..96483139 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeMultiplatformProjectRecipe.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeMultiplatformProjectRecipe.kt
@@ -1,21 +1,27 @@
 package com.github.cnrture.quickprojectwizard.projectwizard.recipes
 
 import com.android.tools.idea.wizard.template.ModuleTemplateData
+import com.android.tools.idea.wizard.template.RecipeExecutor
 import com.android.tools.idea.wizard.template.escapeKotlinIdentifier
 import com.github.cnrture.quickprojectwizard.service.AnalyticsService
 import com.github.cnrture.quickprojectwizard.common.Utils
+import com.github.cnrture.quickprojectwizard.common.addRootFile
 import com.github.cnrture.quickprojectwizard.data.CMPConfigModel
 import com.github.cnrture.quickprojectwizard.data.CMPImageLibrary
 import com.github.cnrture.quickprojectwizard.data.CMPNetworkLibrary
 import com.github.cnrture.quickprojectwizard.projectwizard.cmparch.*
 import com.github.cnrture.quickprojectwizard.projectwizard.gradle.Versions
+import com.github.cnrture.quickprojectwizard.projectwizard.gradle.network.getVersions
 import com.intellij.ide.fileTemplates.FileTemplateManager
 import com.intellij.ide.starters.local.GeneratorAsset
 import com.intellij.ide.starters.local.GeneratorEmptyDirectory
 import com.intellij.ide.starters.local.GeneratorTemplateFile
+import kotlinx.coroutines.runBlocking
 import org.jetbrains.kotlin.idea.core.util.toVirtualFile
+import java.io.File
+import java.io.StringWriter
 
-fun composeMultiplatformProjectRecipe(
+fun RecipeExecutor.composeMultiplatformProjectRecipe(
     moduleData: ModuleTemplateData,
     packageName: String,
     isAndroidEnable: Boolean,
@@ -29,9 +35,33 @@ fun composeMultiplatformProjectRecipe(
     isDataDomainDiUiEnable: Boolean,
     screens: String,
 ) {
+    runBlocking {
+        try {
+            getVersions()
+        } catch (e: Exception) {
+            println("Failed to fetch versions: ${e.message}")
+        }
+    }
     val analyticsService = AnalyticsService.getInstance()
     val (projectData, _, _) = moduleData
     val packagePath = escapeKotlinIdentifier(packageName)
+    
+    val projectRoot = projectData.rootDir
+    // For Compose Multiplatform, we force KTS as it's the standard and most reliable way
+    // and the user mentioned they don't mind if it's KTS for CMP.
+    val isKts = true
+    
+    // Proactively neutralize Groovy files if they were pre-created by the Wizard.
+    // We save an empty string to them or try to delete them. 
+    // Deleting them from disk is more effective to prevent them from showing up in the project.
+    try {
+        val groovyBuild = File(projectRoot, "build.gradle")
+        val groovySettings = File(projectRoot, "settings.gradle")
+        if (groovyBuild.exists()) groovyBuild.delete()
+        if (groovySettings.exists()) groovySettings.delete()
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
 
     val screenList = if (screens.isNotEmpty()) {
         screens.split(",").map { it.trim() }.filter { it.isNotEmpty() }
@@ -100,6 +130,7 @@ fun composeMultiplatformProjectRecipe(
         this.isDataDomainDiUiEnable = isDataDomainDiUiEnable
         this.screens = screenList
         this.packageName = packagePath
+        this.isKts = isKts
     }
     val isKtorEnable = config.selectedNetworkLibrary == CMPNetworkLibrary.Ktor
     val isKtorfitEnable = config.selectedNetworkLibrary == CMPNetworkLibrary.Ktorfit
@@ -127,6 +158,7 @@ fun composeMultiplatformProjectRecipe(
         "IS_KOIN_ENABLE" to config.isKoinEnable,
         "IS_NAVIGATION_ENABLE" to config.isNavigationEnable,
         "IS_DATA_DOMAIN_DI_UI_ENABLE" to config.isDataDomainDiUiEnable,
+        "IS_KTS" to config.isKts,
         "SCREENS" to screenList,
         "CMP_AGP" to Versions.versionList["cmp-agp"].orEmpty(),
         "CMP_KOTLIN" to Versions.versionList["cmp-kotlin"].orEmpty(),
@@ -162,10 +194,19 @@ fun composeMultiplatformProjectRecipe(
             if (config.isDesktopEnable) DesktopFileGenerator(config) else null,
         )
         assets.addAll(platforms.flatMap { it.generate(fileTemplateManager, config.packageName) })
+        
         assets.forEach { asset ->
             when (asset) {
                 is GeneratorEmptyDirectory -> Utils.createEmptyDirectory(this, asset.relativePath)
-                is GeneratorTemplateFile -> Utils.generateFileFromTemplate(dataModel, this, asset)
+                is GeneratorTemplateFile -> {
+                    // Use RecipeExecutor.save for everything to ensure correct behavior in Wizard
+                    try {
+                        val content = Utils.processTemplate(dataModel, asset)
+                        save(content, projectRoot.resolve(asset.relativePath))
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
                 else -> throw IllegalArgumentException("Unknown asset type: $asset")
             }
         }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeProjectRecipe.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeProjectRecipe.kt
index 024394c4..fc60c02d 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeProjectRecipe.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/ComposeProjectRecipe.kt
@@ -347,7 +347,7 @@ private fun RecipeExecutor.addScreens(
     }
 }
 
-private fun addDependenciesAndGradle(
+private fun RecipeExecutor.addDependenciesAndGradle(
     moduleData: ModuleTemplateData,
     selectedDILibrary: DILibrary,
     isKtLintEnable: Boolean,
@@ -375,6 +375,17 @@ private fun addDependenciesAndGradle(
         selectedImageLibrary = selectedImageLibrary,
     )
 
+    val projectRoot = moduleData.rootDir.parentFile
+    
+    // Fallback: Check if the project is using KTS or Groovy
+    // We check for .kts files first. If they exist, isKts = true.
+    val isKts = File(projectRoot, "settings.gradle.kts").exists() || 
+                File(projectRoot, "build.gradle.kts").exists() ||
+                (!File(projectRoot, "settings.gradle").exists() && !File(projectRoot, "build.gradle").exists())
+
+    val buildGradlePath = if (isKts) "app/build.gradle.kts" else "app/build.gradle"
+    val projectBuildGradlePath = if (isKts) "build.gradle.kts" else "build.gradle"
+
     val gradleKts = getGradleKts(
         isCompose = true,
         selectedDILibrary = selectedDILibrary,
@@ -389,42 +400,24 @@ private fun addDependenciesAndGradle(
         packagePath = packagePath,
         minApi = minApi,
         javaJvmVersion = javaJvmVersion,
+        isKts = isKts
     )
 
     val projectGradleKts =
         getProjectGradleKts(
-            true,
-            selectedDILibrary,
-            isRoomEnable,
-            isKtLintEnable,
-            isDetektEnable,
-            isFirebaseEnable,
-            isNavigationEnable,
-            selectedImageLibrary,
-        )
-
-    val libsVersionFile = File(moduleData.rootDir.parentFile, "gradle/libs.versions.toml")
-    val buildGradleFile = File(moduleData.rootDir.parentFile, "app/build.gradle.kts")
-    val projectBuildGradleFile = File(moduleData.rootDir.parentFile, "build.gradle.kts")
-
-    if (libsVersionFile.exists() && libsVersionFile.isFile) {
-        libsVersionFile.writeText(
-            """$dependencies
-            """.trimIndent()
+            isCompose = true,
+            selectedDILibrary = selectedDILibrary,
+            isRoomEnable = isRoomEnable,
+            isKtLintEnable = isKtLintEnable,
+            isDetektEnable = isDetektEnable,
+            isFirebaseEnable = isFirebaseEnable,
+            isNavigationEnable = isNavigationEnable,
+            selectedImageLibrary = selectedImageLibrary,
+            isKts = isKts
         )
-    }
 
-    if (buildGradleFile.exists() && buildGradleFile.isFile) {
-        buildGradleFile.writeText(
-            """$gradleKts
-            """.trimIndent()
-        )
-    }
-
-    if (projectBuildGradleFile.exists() && projectBuildGradleFile.isFile) {
-        projectBuildGradleFile.writeText(
-            """$projectGradleKts
-            """.trimIndent()
-        )
-    }
+    // Use RecipeExecutor.save for ALL files to ensure integration with Wizard
+    addRootFile(dependencies.toString(), moduleData, "gradle/libs.versions.toml")
+    addRootFile(gradleKts.toString(), moduleData, buildGradlePath)
+    addRootFile(projectGradleKts.toString(), moduleData, projectBuildGradlePath)
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/XMLProjectRecipe.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/XMLProjectRecipe.kt
index c1331b74..45cfaf3e 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/XMLProjectRecipe.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/projectwizard/recipes/XMLProjectRecipe.kt
@@ -294,7 +294,7 @@ private fun RecipeExecutor.addScreens(
     }
 }
 
-private fun addDependenciesAndGradle(
+private fun RecipeExecutor.addDependenciesAndGradle(
     moduleData: ModuleTemplateData,
     selectedDILibrary: DILibrary,
     isKtLintEnable: Boolean,
@@ -310,6 +310,17 @@ private fun addDependenciesAndGradle(
     javaJvmVersion: String,
     styleName: String,
 ) {
+    val projectRoot = moduleData.rootDir.parentFile
+    
+    // Fallback: Check if the project is using KTS or Groovy
+    // We check for .kts files first. If they exist, isKts = true.
+    val isKts = File(projectRoot, "settings.gradle.kts").exists() || 
+                File(projectRoot, "build.gradle.kts").exists() ||
+                (!File(projectRoot, "settings.gradle").exists() && !File(projectRoot, "build.gradle").exists())
+
+    val buildGradlePath = if (isKts) "app/build.gradle.kts" else "app/build.gradle"
+    val projectBuildGradlePath = if (isKts) "build.gradle.kts" else "build.gradle"
+
     val dependencies = getDependencies(
         isCompose = false,
         selectedDILibrary = selectedDILibrary,
@@ -337,50 +348,28 @@ private fun addDependenciesAndGradle(
         packagePath = packagePath,
         minApi = minApi,
         javaJvmVersion = javaJvmVersion,
+        isKts = isKts
     )
 
     val projectGradleKts =
         getProjectGradleKts(
-            false,
-            selectedDILibrary,
-            isRoomEnable,
-            isKtLintEnable,
-            isDetektEnable,
-            isFirebaseEnable,
-            isNavigationEnable,
-            selectedImageLibrary,
-        )
-
-    val libsVersionFile = File(moduleData.rootDir.parentFile, "gradle/libs.versions.toml")
-    val buildGradleFile = File(moduleData.rootDir.parentFile, "app/build.gradle.kts")
-    val projectBuildGradleFile = File(moduleData.rootDir.parentFile, "build.gradle.kts")
-    val themesFile = File(moduleData.rootDir.parentFile, "app/src/main/res/values/themes.xml")
-    val themesNightFile = File(moduleData.rootDir.parentFile, "app/src/main/res/values-night/themes.xml")
-
-    if (libsVersionFile.exists() && libsVersionFile.isFile) {
-        libsVersionFile.writeText(
-            """$dependencies
-            """.trimIndent()
-        )
-    }
-
-    if (buildGradleFile.exists() && buildGradleFile.isFile) {
-        buildGradleFile.writeText(
-            """$gradleKts
-            """.trimIndent()
+            isCompose = false,
+            selectedDILibrary = selectedDILibrary,
+            isRoomEnable = isRoomEnable,
+            isKtLintEnable = isKtLintEnable,
+            isDetektEnable = isDetektEnable,
+            isFirebaseEnable = isFirebaseEnable,
+            isNavigationEnable = isNavigationEnable,
+            selectedImageLibrary = selectedImageLibrary,
+            isKts = isKts
         )
-    }
 
-    if (projectBuildGradleFile.exists() && projectBuildGradleFile.isFile) {
-        projectBuildGradleFile.writeText(
-            """$projectGradleKts
-            """.trimIndent()
-        )
-    }
+    // Use RecipeExecutor.save for ALL files to ensure integration with Wizard
+    addRootFile(dependencies.toString(), moduleData, "gradle/libs.versions.toml")
+    addRootFile(gradleKts.toString(), moduleData, buildGradlePath)
+    addRootFile(projectGradleKts.toString(), moduleData, projectBuildGradlePath)
 
-    if (themesFile.exists() && themesFile.isFile) {
-        themesFile.writeText(
-            """
+    val themesContent = """
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.${styleName}" parent="Theme.Material3.DayNight.NoActionBar">
@@ -391,22 +380,7 @@ private fun addDependenciesAndGradle(
     <style name="$styleName" parent="Base.${styleName}" />
 </resources>
 """.trimIndent()
-        )
-    }
 
-    if (themesNightFile.exists() && themesNightFile.isFile) {
-        themesNightFile.writeText(
-            """
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.${styleName}" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-    </style>
-
-    <style name="$styleName" parent="Base.${styleName}" />
-</resources>
-""".trimIndent()
-        )
-    }
+    addRootFile(themesContent, moduleData, "app/src/main/res/values/themes.xml")
+    addRootFile(themesContent, moduleData, "app/src/main/res/values-night/themes.xml")
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/GradleTemplate.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/GradleTemplate.kt
index c7b69639..55ac1782 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/GradleTemplate.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/GradleTemplate.kt
@@ -1,28 +1,35 @@
 package com.github.cnrture.quickprojectwizard.toolwindow.template
 
 object GradleTemplate {
-    fun getAndroidModuleGradleTemplate(packageName: String, dependencies: String, plugins: String = ""): String {
+    fun getAndroidModuleGradleTemplate(
+        packageName: String,
+        dependencies: String,
+        plugins: String = "",
+        isKts: Boolean = true
+    ): String {
+        val assignment = if (isKts) " = " else " "
         return """
 plugins {
 $plugins
 }
 
 android {
-    namespace = "$packageName"
-    compileSdk = 36
-
+    namespace${assignment}"$packageName"
+    compileSdk${assignment}36
+    
+    buildFeatures {
+        buildConfig${assignment}true
+        viewBinding${assignment}true
+    }
+    
     defaultConfig {
-        minSdk = 21
-        targetSdk = 36
+        minSdk${assignment}21
+        targetSdk${assignment}36
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    buildFeatures {
-        buildConfig = true
+        sourceCompatibility${assignment}JavaVersion.VERSION_17
+        targetCompatibility${assignment}JavaVersion.VERSION_17
     }
 }
 
@@ -31,7 +38,23 @@ dependencies {
 }""".trimIndent()
     }
 
-    fun getKotlinModuleGradleTemplate(plugins: String = "") = """
+    fun getKotlinModuleGradleTemplate(plugins: String = "", isKts: Boolean = true): String {
+        return if (isKts) {
+            """
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")${if (plugins.isNotEmpty()) "\n$plugins" else ""}
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+dependencies {
+}""".trimIndent()
+        } else {
+            """
 plugins {
     id 'java-library'
     id 'org.jetbrains.kotlin.jvm'${if (plugins.isNotEmpty()) "\n$plugins" else ""}
@@ -44,4 +67,6 @@ java {
 
 dependencies {
 }""".trimIndent()
+        }
+    }
 }
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/TemplateWriter.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/TemplateWriter.kt
index 984d537d..6019e51b 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/TemplateWriter.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/template/TemplateWriter.kt
@@ -23,16 +23,17 @@ class TemplateWriter {
         dependencies: List<String> = emptyList(),
         libraryDependencies: String = Constants.EMPTY,
         pluginDependencies: String = Constants.EMPTY,
+        isKts: Boolean = true,
     ): List<File> {
         try {
             val gradleTemplate = if (moduleType == Constants.ANDROID) {
                 val dependencies = buildDependenciesBlock(dependencies, libraryDependencies)
-                GradleTemplate.getAndroidModuleGradleTemplate(packageName, dependencies, pluginDependencies)
+                GradleTemplate.getAndroidModuleGradleTemplate(packageName, dependencies, pluginDependencies, isKts)
             } else {
-                GradleTemplate.getKotlinModuleGradleTemplate(plugins = pluginDependencies)
+                GradleTemplate.getKotlinModuleGradleTemplate(pluginDependencies, isKts)
             }
 
-            val fileName = "build.gradle.kts"
+            val fileName = if (isKts) "build.gradle.kts" else "build.gradle"
             val filePath = Paths.get(moduleFile.absolutePath, fileName).toFile()
             val file: Writer = FileWriter(Paths.get(moduleFile.absolutePath, fileName).toFile())
             file.write(gradleTemplate)
diff --git a/src/main/resources/fileTemplates/code/gradle_wrapper.properties.ft b/src/main/resources/fileTemplates/code/gradle_wrapper.properties.ft
index 42f0071e..56ddc0ff 100644
--- a/src/main/resources/fileTemplates/code/gradle_wrapper.properties.ft
+++ b/src/main/resources/fileTemplates/code/gradle_wrapper.properties.ft
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/resources/fileTemplates/code/project_build.gradle.kts.ft b/src/main/resources/fileTemplates/code/project_build.gradle.kts.ft
index 87ed356a..ae48b6e7 100644
--- a/src/main/resources/fileTemplates/code/project_build.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/code/project_build.gradle.kts.ft
@@ -1,11 +1,23 @@
 plugins {
+    <#if IS_KTS>
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.composeMultiplatform) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinxSerialization) apply false
-<#if IS_ROOM_ENABLE>
+    <#if IS_ROOM_ENABLE>
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.room.plugin) apply false
-</#if>
+    </#if>
+    <#else>
+    alias libs.plugins.androidApplication apply false
+    alias libs.plugins.composeCompiler apply false
+    alias libs.plugins.composeMultiplatform apply false
+    alias libs.plugins.kotlinMultiplatform apply false
+    alias libs.plugins.kotlinxSerialization apply false
+    <#if IS_ROOM_ENABLE>
+    alias libs.plugins.ksp apply false
+    alias libs.plugins.room.plugin apply false
+    </#if>
+    </#if>
 }
diff --git a/src/main/resources/fileTemplates/code/settings.gradle.kts.ft b/src/main/resources/fileTemplates/code/settings.gradle.kts.ft
index dba13998..179b38cc 100644
--- a/src/main/resources/fileTemplates/code/settings.gradle.kts.ft
+++ b/src/main/resources/fileTemplates/code/settings.gradle.kts.ft
@@ -1,5 +1,9 @@
 rootProject.name = "${APP_NAME}"
+<#if IS_KTS>
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+<#else>
+enableFeaturePreview('TYPESAFE_PROJECT_ACCESSORS')
+</#if>
 
 pluginManagement {
     repositories {
@@ -28,4 +32,8 @@ dependencyResolutionManagement {
     }
 }
 
+<#if IS_KTS>
 include(":composeApp")
+<#else>
+include ':composeApp'
+</#if>