diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34f6ed6..dd9be10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
         run: ./gradlew publishToMavenLocal -PVERSION_NAME=0.0.0-SNAPSHOT
 
       - name: Check spotless
-        run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
+        run: ./gradlew spotlessCheck --init-script gradle/init.gradle --no-configuration-cache
 
       - name: Test AGP compatibility
         run: chmod +x ./test_agp.sh && ./test_agp.sh
diff --git a/README.md b/README.md
index 82ebc7a..1a962f2 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,8 @@ The Kace currently supports the above four most commonly used types. Other types
 | 1.9.20-1.2.0 | 1.9.20       | 4.2.2 | 6.8.3  |
 | 2.0.0-1.2.0  | 2.0.0        | 7.1.3 | 7.2    |
 | 2.0.20-1.2.0 | 2.0.20       | 7.1.3 | 7.2    |
-| 2.1.0-1.2.0  | 2.1.0       | 7.3.1 | 7.6.3  |
+| 2.1.0-1.2.0  | 2.1.0        | 7.3.1 | 7.6.3  |
+| 2.2.0-1.2.0  | 2.2.0        | 7.3.1 | 7.6.3  |
 
 Since the goal of the Kace is to help developers easily upgrade to Kotlin 1.8, the minimum supported version of Kotlin is relatively high
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..996a6a2
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,33 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
+
+    // Use Kotlin 2.0.0 to build gradle plugin and compiler plugin for 2.1.0
+    // to avoid incompatible issue with gradle build.
+    id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
+    id 'org.jetbrains.kotlin.jvm' version '2.2.0' apply false
+
+    id 'com.vanniktech.maven.publish' version '0.18.0' apply false
+    id 'com.github.gmazzo.buildconfig' version '2.1.0' apply false
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+    }
+
+    apply plugin: "com.vanniktech.maven.publish"
+
+    plugins.withId("java") {
+        project.extensions.getByType(org.gradle.api.plugins.JavaPluginExtension).sourceCompatibility = org.gradle.api.JavaVersion.VERSION_1_8
+    }
+    plugins.withId("org.jetbrains.kotlin.jvm") {
+        project.extensions.getByType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension).compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+    }
+    plugins.withId("org.jetbrains.kotlin.android") {
+        project.extensions.getByType(org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension).compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 4a8c961..0000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,37 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id("com.android.application") version "7.3.1" apply false
-    id("com.android.library") version "7.3.1" apply false
-
-    // Use Kotlin 2.0.0 to build gradle plugin and compiler plugin for 2.1.0
-    // to avoid incompatible issue with gradle build.
-    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
-    id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false
-
-    id("com.vanniktech.maven.publish") version "0.18.0" apply false
-    id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        maven { setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
-    }
-
-    apply(plugin = "com.vanniktech.maven.publish")
-
-    pluginManager.withPlugin("java") {
-        extensions.getByType<JavaPluginExtension>().sourceCompatibility = JavaVersion.VERSION_1_8
-    }
-    pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
-        extensions.getByType<KotlinJvmProjectExtension>().compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
-    }
-    pluginManager.withPlugin("org.jetbrains.kotlin.android") {
-        extensions.getByType<KotlinAndroidProjectExtension>().compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index b0ac9b6..3e3586a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 
 KOTLIN_PLUGIN_ID=com.kanyun.kace
-VERSION_NAME=2.1.0-1.2.0
+VERSION_NAME=2.2.0-1.2.0-SNAPSHOT
 
 GROUP=com.kanyun.kace
 
diff --git a/gradle/init.gradle b/gradle/init.gradle
new file mode 100644
index 0000000..d8f3ad0
--- /dev/null
+++ b/gradle/init.gradle
@@ -0,0 +1,46 @@
+ext.ktlintVersion = "0.49.1"
+
+initscript {
+    def spotlessVersion = "6.19.0"
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
+    }
+}
+
+rootProject {
+    subprojects {
+        apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin
+        spotless {
+            kotlin {
+                target '**/*.kt'
+                targetExclude '**/build/**/*.kt'
+                ktlint(ktlintVersion).userData(
+                        [
+                                "android"                                    : "true",
+                                "max_line_length"                            : "200",
+                                "ij_kotlin_allow_trailing_comma"             : "false",
+                                "ij_kotlin_allow_trailing_comma_on_call_site": "false"
+                        ]
+                )
+                licenseHeaderFile rootProject.file("spotless/copyright.kt")
+            }
+            format 'kts', {
+                target '**/*.kts'
+                targetExclude '**/build/**/*.kts'
+                // Look for the first line that doesn't have a block comment (assumed to be the license)
+                licenseHeaderFile rootProject.file("spotless/copyright.kts"), "(^(?![\\\\/ ]\\\\*).*\$)"
+            }
+            format 'xml', {
+                target '**/*.xml'
+                targetExclude '**/build/**/*.xml'
+                // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
+                licenseHeaderFile rootProject.file("spotless/copyright.xml"), "(<[^!?])"
+            }
+        }
+    }
+}
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
deleted file mode 100644
index efc7499..0000000
--- a/gradle/init.gradle.kts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2022 KanYun
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-val ktlintVersion = "0.49.1"
-
-initscript {
-    val spotlessVersion = "6.19.0"
-
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
-    }
-}
-
-rootProject {
-    subprojects {
-        apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
-        extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
-            kotlin {
-                target("**/*.kt")
-                targetExclude("**/build/**/*.kt")
-                ktlint(ktlintVersion).userData(
-                    mapOf(
-                        "android" to "true",
-                        "max_line_length" to "200",
-                        "ij_kotlin_allow_trailing_comma" to "false",
-                        "ij_kotlin_allow_trailing_comma_on_call_site" to "false"
-                    )
-                )
-                licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
-            }
-            format("kts") {
-                target("**/*.kts")
-                targetExclude("**/build/**/*.kts")
-                // Look for the first line that doesn't have a block comment (assumed to be the license)
-                licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
-            }
-            format("xml") {
-                target("**/*.xml")
-                targetExclude("**/build/**/*.xml")
-                // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
-                licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
-            }
-        }
-    }
-}
diff --git a/kace-compiler/build.gradle b/kace-compiler/build.gradle
new file mode 100644
index 0000000..619aa0f
--- /dev/null
+++ b/kace-compiler/build.gradle
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 KanYun
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id 'org.jetbrains.kotlin.jvm'
+    id 'java'
+    id 'org.jetbrains.kotlin.kapt'
+    id 'com.github.gmazzo.buildconfig'
+    id 'com.vanniktech.maven.publish'
+    id 'maven-publish'
+}
+
+// Build this project with Kotlin 2.0.0 for compatibility reason.
+// But we should depend on libs for Kotlin 2.1.0.
+def kotlinVersion = "2.2.0"
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}"
+
+    kapt "com.google.auto.service:auto-service:1.0.1"
+    compileOnly "com.google.auto.service:auto-service-annotations:1.0.1"
+
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
+    testImplementation "com.bennyhuo.kotlin:kotlin-compile-testing-extensions:2.2.0-1.3.0"
+}
+
+tasks.named('compileKotlin', org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    compilerOptions {
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+    }
+}
+
+buildConfig {
+    packageName = project.group
+    buildConfigField "String", "KOTLIN_PLUGIN_ID", "\"${project.property('KOTLIN_PLUGIN_ID')}\""
+}
diff --git a/kace-compiler/build.gradle.kts b/kace-compiler/build.gradle.kts
deleted file mode 100644
index 96aff79..0000000
--- a/kace-compiler/build.gradle.kts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2022 KanYun
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    kotlin("jvm")
-    java
-    kotlin("kapt")
-    id("com.github.gmazzo.buildconfig")
-    id("com.vanniktech.maven.publish")
-    `maven-publish`
-}
-
-// Build this project with Kotlin 2.0.0 for compatibility reason.
-// But we should depend on libs for Kotlin 2.1.0.
-val kotlinVersion = "2.1.0"
-
-dependencies {
-    implementation(kotlin("stdlib-jdk8", kotlinVersion))
-    implementation(kotlin("reflect", kotlinVersion))
-    implementation(kotlin("compiler-embeddable", kotlinVersion))
-
-    kapt("com.google.auto.service:auto-service:1.0.1")
-    compileOnly("com.google.auto.service:auto-service-annotations:1.0.1")
-
-    testImplementation(kotlin("test-junit"))
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:2.1.0-1.3.0")
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.compilerOptions {
-    freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
-    jvmTarget.set(JvmTarget.JVM_1_8)
-}
-
-buildConfig {
-    packageName("$group")
-    buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${project.property("KOTLIN_PLUGIN_ID")}\"")
-}
diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt
index 999de4b..3c979cb 100644
--- a/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt
+++ b/kace-compiler/src/main/java/com/kanyun/kace/compiler/KaceIrTransformer.kt
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.types.makeNullable
 import org.jetbrains.kotlin.ir.util.SYNTHETIC_OFFSET
 import org.jetbrains.kotlin.ir.util.constructors
+import org.jetbrains.kotlin.ir.util.nonDispatchParameters
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 
 class KaceIrTransformer(private val context: IrPluginContext) : IrElementTransformerVoid() {
@@ -99,11 +100,9 @@ class KaceIrTransformer(private val context: IrPluginContext) : IrElementTransfo
                             ).apply {
                                 dispatchReceiver = androidExtensionsValue
 
-                                valueParameters.forEachIndexed { index, irValueParameter ->
-                                    putValueArgument(
-                                        index,
-                                        irGet(irValueParameter.type, irValueParameter.symbol),
-                                    )
+                                nonDispatchParameters.forEachIndexed { index, irValueParameter ->
+                                    arguments[index + 1] =
+                                        irGet(irValueParameter.type, irValueParameter.symbol)
                                 }
                             },
                         )
diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/Ir.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/Ir.kt
index 1a495fb..a0f0862 100644
--- a/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/Ir.kt
+++ b/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/Ir.kt
@@ -19,6 +19,7 @@ package com.kanyun.kace.compiler.utils
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrParameterKind
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.types.classFqName
 import org.jetbrains.kotlin.ir.types.classifierOrNull
@@ -32,12 +33,13 @@ fun IrClass.findViewByIdCached(pluginContext: IrPluginContext): IrSimpleFunction
 }
 
 fun IrFunction.isFindViewByIdCached(pluginContext: IrPluginContext): Boolean {
+    val regularParameter = parameters.filter { it.kind === IrParameterKind.Regular }
     return name.identifier == FIND_VIEW_BY_ID_CACHED_NAME &&
-        valueParameters.size == 3 &&
-        valueParameters[0].type == pluginContext.typeOfAndroidExtensionsBase() &&
-        valueParameters[1].type == pluginContext.symbols.int.defaultType &&
+        regularParameter.size == 3 &&
+        regularParameter[0].type == pluginContext.typeOfAndroidExtensionsBase() &&
+        regularParameter[1].type == pluginContext.symbols.int.defaultType &&
         // java.lang.Class<T> -> java.lang.Class
-        valueParameters[2].type.classifierOrNull?.defaultType == pluginContext.typeOfJavaClass()
+        regularParameter[2].type.classifierOrNull?.defaultType == pluginContext.typeOfJavaClass()
 }
 
 fun IrClass.isAndroidExtensions(): Boolean {
diff --git a/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt b/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt
index 7ae1b72..3e13687 100644
--- a/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt
+++ b/kace-compiler/src/main/java/com/kanyun/kace/compiler/utils/IrCommon.kt
@@ -16,7 +16,6 @@
 
 package com.kanyun.kace.compiler.utils
 
-import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -30,8 +29,10 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.util.allOverridden
 import org.jetbrains.kotlin.ir.util.copyTo
+import org.jetbrains.kotlin.ir.util.erasedUpperBound
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.ir.util.functions
+import org.jetbrains.kotlin.ir.util.nonDispatchParameters
 import org.jetbrains.kotlin.ir.util.parentAsClass
 import org.jetbrains.kotlin.ir.util.parentClassOrNull
 import org.jetbrains.kotlin.name.FqName
@@ -60,7 +61,7 @@ fun IrClass.addOverride(
     this.origin = IrDeclarationOrigin.DEFINED
 }.apply {
     val thisReceiver = parentAsClass.thisReceiver!!
-    dispatchReceiverParameter = thisReceiver.copyTo(this, type = thisReceiver.type)
+    parameters = listOf(thisReceiver.copyTo(this, type = thisReceiver.type)) + nonDispatchParameters
 
     overriddenSymbols = superTypes.mapNotNull { superType ->
         superType.classOrNull?.owner?.takeIf { superClass ->
diff --git a/kace-gradle-plugin/build.gradle b/kace-gradle-plugin/build.gradle
new file mode 100644
index 0000000..654a731
--- /dev/null
+++ b/kace-gradle-plugin/build.gradle
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 KanYun
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+plugins {
+    id 'java-gradle-plugin'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'com.github.gmazzo.buildconfig'
+    id 'maven-publish'
+    id 'com.vanniktech.maven.publish'
+}
+
+dependencies {
+    compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+
+    compileOnly "com.android.tools.build:gradle:7.3.1"
+}
+
+buildConfig {
+    def compilerPluginProject = project(":kace-compiler")
+    packageName = "${compilerPluginProject.group}"
+    buildConfigField "String", "KOTLIN_PLUGIN_ID", "\"${project.property('KOTLIN_PLUGIN_ID')}\""
+    buildConfigField "String", "KOTLIN_PLUGIN_GROUP", "\"${compilerPluginProject.group}\""
+    buildConfigField "String", "KOTLIN_PLUGIN_NAME", "\"${compilerPluginProject.property('POM_ARTIFACT_ID')}\""
+    buildConfigField "String", "KOTLIN_PLUGIN_VERSION", "\"${compilerPluginProject.version}\""
+}
+
+gradlePlugin {
+    plugins {
+        KaceGradlePlugin {
+            id = project.properties['KOTLIN_PLUGIN_ID']
+            displayName = "Kotlin Kace plugin"
+            description = "Kotlin Kace plugin"
+            implementationClass = "com.kanyun.kace.gradle.KaceGradlePlugin"
+        }
+    }
+}
diff --git a/kace-gradle-plugin/build.gradle.kts b/kace-gradle-plugin/build.gradle.kts
deleted file mode 100644
index 74316cb..0000000
--- a/kace-gradle-plugin/build.gradle.kts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2022 KanYun
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-plugins {
-    id("java-gradle-plugin")
-    kotlin("jvm")
-    id("com.github.gmazzo.buildconfig")
-    `maven-publish`
-    id("com.vanniktech.maven.publish")
-}
-
-dependencies {
-    compileOnly(kotlin("gradle-plugin"))
-    compileOnly(kotlin("stdlib-jdk8"))
-
-    compileOnly("com.android.tools.build:gradle:7.3.1")
-}
-
-buildConfig {
-    val compilerPluginProject = project(":kace-compiler")
-    packageName("${compilerPluginProject.group}")
-    buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${property("KOTLIN_PLUGIN_ID")}\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_GROUP", "\"${compilerPluginProject.group}\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_NAME", "\"${compilerPluginProject.property("POM_ARTIFACT_ID")}\"")
-    buildConfigField("String", "KOTLIN_PLUGIN_VERSION", "\"${compilerPluginProject.version}\"")
-}
-
-gradlePlugin {
-    plugins {
-        create("KaceGradlePlugin") {
-            id = project.properties["KOTLIN_PLUGIN_ID"] as String
-            displayName = "Kotlin Kace plugin"
-            description = "Kotlin Kace plugin"
-            implementationClass = "com.kanyun.kace.gradle.KaceGradlePlugin"
-        }
-    }
-}
\ No newline at end of file
diff --git a/kace-sample/app/build.gradle b/kace-sample/app/build.gradle
new file mode 100644
index 0000000..33c87cc
--- /dev/null
+++ b/kace-sample/app/build.gradle
@@ -0,0 +1,96 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-parcelize'
+    id 'com.kanyun.kace'
+}
+
+android {
+    compileSdk = vgoCompileSdkVersion.toInteger()
+
+    defaultConfig {
+        applicationId = "com.kanyun.kace.sample"
+        minSdk = vgoMinSdkVersion.toInteger()
+        targetSdk = vgoTargetSdkVersion.toInteger()
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+        }
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
+    flavorDimensions 'api', 'mode'
+
+    productFlavors {
+        demo {
+            dimension = "mode"
+        }
+
+        full {
+            dimension = "mode"
+        }
+
+        minApi23 {
+            dimension = "api"
+            minSdk = 23
+            versionCode = 20000 + android.defaultConfig.versionCode
+            versionNameSuffix = "-minApi23"
+        }
+
+        minApi21 {
+            dimension = "api"
+            minSdk = 21
+            versionCode = 10000 + android.defaultConfig.versionCode
+            versionNameSuffix = "-minApi21"
+        }
+    }
+}
+
+dependencies {
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "com.google.android.material:material:1.5.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.4.1"
+    implementation "androidx.navigation:navigation-ui-ktx:2.4.1"
+
+    // custom deps below
+    implementation project(":sample-lib")
+}
+
+kace {
+    customVariant = [debug: [file("src/debug/res000").absolutePath]]
+    customVariant {
+        if (it.buildType.name.contains("debug")) {
+            return [
+                "debug": [
+                    file("src/debug/res1").absolutePath,
+                    file("src/debug/res2").absolutePath
+                ]
+            ]
+        } else if (it.buildType.name.contains("release")) {
+            return [
+                "release": [
+                    file("src/release/res1").absolutePath,
+                    file("src/release/res2").absolutePath
+                ]
+            ]
+        } else {
+            return [:]
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+    }
+}
diff --git a/kace-sample/app/build.gradle.kts b/kace-sample/app/build.gradle.kts
deleted file mode 100644
index 48c7be6..0000000
--- a/kace-sample/app/build.gradle.kts
+++ /dev/null
@@ -1,107 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("kotlin-parcelize")
-    id("com.kanyun.kace")
-}
-
-val vgoCompileSdkVersion: String by extra
-val vgoMinSdkVersion: String by extra
-val vgoTargetSdkVersion: String by extra
-
-android {
-    compileSdk = vgoCompileSdkVersion.toInt()
-
-    defaultConfig {
-        applicationId = "com.kanyun.kace.sample"
-        minSdk = vgoMinSdkVersion.toInt()
-        targetSdk = vgoTargetSdkVersion.toInt()
-        versionCode = 1
-        versionName = "1.0"
-    }
-
-    buildTypes {
-        getByName("release")  {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    flavorDimensions += listOf("api", "mode")
-
-    productFlavors {
-        create("demo") {
-            // Assigns this product flavor to the "mode" flavor dimension.
-            dimension = "mode"
-        }
-
-        create("full") {
-            dimension = "mode"
-        }
-
-        create("minApi23") {
-            dimension = "api"
-            minSdk = 23
-            versionCode = 20000 + (android.defaultConfig.versionCode ?: 0)
-            versionNameSuffix = "-minApi23"
-        }
-
-        create("minApi21") {
-            dimension = "api"
-            minSdk = 21
-            versionCode = 10000 + (android.defaultConfig.versionCode ?: 0)
-            versionNameSuffix = "-minApi21"
-        }
-
-    }
-
-    dependencies {
-        implementation("androidx.core:core-ktx:1.7.0")
-        implementation("androidx.appcompat:appcompat:1.4.1")
-        implementation("com.google.android.material:material:1.5.0")
-        implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-        implementation("androidx.navigation:navigation-fragment-ktx:2.4.1")
-        implementation("androidx.navigation:navigation-ui-ktx:2.4.1")
-
-        // custom deps below
-        implementation(project(":sample-lib"))
-    }
-}
-
-kace {
-    customVariant = mapOf("debug" to listOf(file("src/debug/res000").absolutePath))
-    customVariant {
-        when {
-            "debug" in it.buildType.name -> mapOf(
-                "debug" to listOf(
-                    file("src/debug/res1").absolutePath,
-                    file("src/debug/res2").absolutePath
-                )
-            )
-
-            "release" in it.buildType.name -> mapOf(
-                "release" to listOf(
-                    file("src/release/res1").absolutePath,
-                    file("src/release/res2").absolutePath
-                )
-            )
-
-            else -> emptyMap()
-        }
-    }
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
-    }
-}
\ No newline at end of file
diff --git a/kace-sample/build.gradle b/kace-sample/build.gradle
new file mode 100644
index 0000000..472ac89
--- /dev/null
+++ b/kace-sample/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
+    id 'org.jetbrains.kotlin.jvm' version '2.2.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
+    id 'com.kanyun.kace' version '0.0.0-SNAPSHOT' apply false
+}
+
+task clean(type: Delete) {
+    group = "build"
+    delete rootProject.buildDir
+}
+
+allprojects {
+    repositories {
+        if (project.hasProperty("testAgp") && project.property("testAgp") == "true") {
+            mavenLocal()
+        }
+        google()
+        mavenCentral()
+    }
+}
diff --git a/kace-sample/build.gradle.kts b/kace-sample/build.gradle.kts
deleted file mode 100644
index 8bc4aea..0000000
--- a/kace-sample/build.gradle.kts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id("com.android.application") version "7.3.1" apply false
-    id("com.android.library") version "7.3.1" apply false
-    id("org.jetbrains.kotlin.jvm") version "2.1.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
-    id("com.kanyun.kace") version "0.0.0-SNAPSHOT" apply false
-}
-
-tasks.register<Delete>(name = "clean") {
-    group = "build"
-    delete(rootProject.buildDir)
-}
-
-allprojects {
-    repositories {
-        if (extra["testAgp"] == "true") {
-            mavenLocal()
-        }
-        google()
-        mavenCentral()
-    }
-}
diff --git a/kace-sample/sample-lib/build.gradle b/kace-sample/sample-lib/build.gradle
new file mode 100644
index 0000000..d8aefc5
--- /dev/null
+++ b/kace-sample/sample-lib/build.gradle
@@ -0,0 +1,40 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-parcelize'
+    id 'com.kanyun.kace'
+}
+
+android {
+    compileSdk = vgoCompileSdkVersion.toInteger()
+
+    defaultConfig {
+        minSdk = vgoMinSdkVersion.toInteger()
+        targetSdk = vgoTargetSdkVersion.toInteger()
+
+        consumerProguardFiles "proguard-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+        }
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
+    resourcePrefix = "sample_lib"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+    }
+}
+
+dependencies {
+    implementation "androidx.appcompat:appcompat:1.4.1"
+}
diff --git a/kace-sample/sample-lib/build.gradle.kts b/kace-sample/sample-lib/build.gradle.kts
deleted file mode 100644
index da24ae1..0000000
--- a/kace-sample/sample-lib/build.gradle.kts
+++ /dev/null
@@ -1,49 +0,0 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    id("kotlin-parcelize")
-    id("com.kanyun.kace")
-}
-
-val vgoCompileSdkVersion: String by extra
-val vgoMinSdkVersion: String by extra
-val vgoTargetSdkVersion: String by extra
-
-android {
-    compileSdk = vgoCompileSdkVersion.toInt()
-
-    defaultConfig {
-        minSdk = vgoMinSdkVersion.toInt()
-        targetSdk = vgoTargetSdkVersion.toInt()
-
-        consumerProguardFiles("proguard-rules.pro")
-    }
-
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    resourcePrefix = "sample_lib"
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
-    }
-}
-
-dependencies {
-    implementation("androidx.appcompat:appcompat:1.4.1")
-}
diff --git a/kace-sample/settings.gradle b/kace-sample/settings.gradle
new file mode 100644
index 0000000..be1696a
--- /dev/null
+++ b/kace-sample/settings.gradle
@@ -0,0 +1,28 @@
+pluginManagement {
+    repositories {
+        if (settings.hasProperty('testAgp') && testAgp == 'true') {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        google()
+    }
+
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.android.application" || requested.id.id == "com.android.library") {
+                useVersion(agpVersion)
+            }
+        }
+    }
+}
+
+
+include ':sample-lib'
+include ':app'
+
+rootProject.name = "kace-sample"
+
+if (!settings.hasProperty('testAgp') || testAgp != 'true') {
+    includeBuild '../../Kace'
+}
diff --git a/kace-sample/settings.gradle.kts b/kace-sample/settings.gradle.kts
deleted file mode 100644
index 6257561..0000000
--- a/kace-sample/settings.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-pluginManagement {
-    val testAgp: String by extra
-    val agpVersion: String by extra
-
-    repositories {
-        if (testAgp == "true") {
-            mavenLocal()
-        }
-        mavenCentral()
-        gradlePluginPortal()
-        google()
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-            val requestedId = requested.id.id
-            if (requestedId == "com.android.application" || requestedId == "com.android.library") {
-                useVersion(agpVersion)
-            }
-        }
-    }
-}
-
-
-include(":sample-lib")
-include(":app")
-
-rootProject.name = "kace-sample"
-val testAgp: String by extra
-if (testAgp != "true") {
-    includeBuild("../../Kace")
-}
\ No newline at end of file