From 6e6c388505d75e62577cd1d661814e2b7ffc7d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Braun?= <zsmb@google.com>
Date: Thu, 19 Jan 2023 10:48:43 +0100
Subject: [PATCH] Create .editorconfig, enable trailing commas

Change-Id: Iee83659c4a08ee1260254effac770038e529979f
---
 .editorconfig          | 6 ++++++
 gradle/init.gradle.kts | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..83be1d5a0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# https://editorconfig.org/
+# This configuration is used by ktlint when spotless invokes it
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
index bd5658fc0..57f91da08 100644
--- a/gradle/init.gradle.kts
+++ b/gradle/init.gradle.kts
@@ -14,10 +14,10 @@
  *   limitations under the License.
  */
 
-val ktlintVersion = "0.43.0"
+val ktlintVersion = "0.48.1"
 
 initscript {
-    val spotlessVersion = "6.11.0"
+    val spotlessVersion = "6.13.0"
 
     repositories {
         mavenCentral()