From f437db2fbd262482d4e0509ab7cb792a14980ac0 Mon Sep 17 00:00:00 2001
From: Wilhelm Schuster <dev@rot13.io>
Date: Wed, 15 Oct 2025 11:44:20 +0200
Subject: [PATCH] Fix kotlin spotless settings

It turned out, these weren't working quite right as the indentation settings weren't taking effact.

Switch to ktlint for j8 compat.
---
 .editorconfig              |  2 +-
 gtnhShared/spotless.gradle | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 4ffbd908..234e6948 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,5 +18,5 @@ end_of_line = crlf
 [*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
 indent_size = 2
 
-[*.lang]
+[*.{lang,md}]
 trim_trailing_whitespace = false
diff --git a/gtnhShared/spotless.gradle b/gtnhShared/spotless.gradle
index ed56cb78..c2de74d3 100644
--- a/gtnhShared/spotless.gradle
+++ b/gtnhShared/spotless.gradle
@@ -20,21 +20,21 @@ spotless {
         toggleOffOn()
         importOrderFile(Blowdryer.file('spotless.importorder'))
         removeUnusedImports()
-        eclipse('4.19.0').configFile(Blowdryer.file('spotless.eclipseformat.xml'))
+        eclipse('4.19').configFile(Blowdryer.file('spotless.eclipseformat.xml'))
     }
     kotlin {
-        target 'src/*/kotlin/**/*.kt'
+        target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt'
 
         toggleOffOn()
-        ktfmt('0.39')
-
         trimTrailingWhitespace()
-        indentWithSpaces(4)
         endWithNewline()
+        ktlint('1.7.1').editorConfigOverride([
+            'ktlint_code_style': 'intellij_idea'
+        ])
     }
     scala {
         target 'src/*/scala/**/*.scala'
 
-        scalafmt('3.7.1')
+        scalafmt('3.7.15')
     }
 }