From 47a3dbd508df5aef715ae0c1e754174590786e69 Mon Sep 17 00:00:00 2001
From: Mansi Pandya <mpandya@mparticle.com>
Date: Mon, 26 Jan 2026 10:58:11 -0500
Subject: [PATCH 1/2] fix: Align ktlint rules for kits with Android Studio
 defaults

---
 .editorconfig | 15 +++++++++++++++
 build.gradle  |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 8b22a8e8a..21ad6bd99 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,21 @@ max_line_length = 150
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 
+# Android default ktlint rules for kits
+# Uses android_studio code style with Android's default standard rules
+[kits/**/*.kt]
+ktlint_code_style = android_studio
+indent_size = 4
+continuation_indent_size = 4
+max_line_length = 150
+insert_final_newline = true
+trim_trailing_whitespace = true
+ktlint_standard_function-signature = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_import-ordering = disabled
+ktlint_standard_no-unused-imports = disabled
+ktlint_standard_class-signature = disabled
+
 [tooling/**/*.kt]
 max_line_length = 200
 
diff --git a/build.gradle b/build.gradle
index f9030b0b8..b59f452fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$gradle_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
 

From f706a31ee228246b996a1ca3ea77d52cfe69b588 Mon Sep 17 00:00:00 2001
From: Mansi Pandya <mpandya@mparticle.com>
Date: Mon, 26 Jan 2026 11:55:04 -0500
Subject: [PATCH 2/2] add TODO for future ktlint alignment

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index 21ad6bd99..9d7548ffe 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -28,6 +28,7 @@ continuation_indent_size = 4
 max_line_length = 150
 insert_final_newline = true
 trim_trailing_whitespace = true
+# TODO: Align ktlint rules for kits with core modules to avoid divergence in coding standards
 ktlint_standard_function-signature = disabled
 ktlint_standard_max-line-length = disabled
 ktlint_standard_import-ordering = disabled