Skip to content

Commit 62dc771

Browse files
authored
Make kotlin spotless config work (#303)
1 parent 1377a82 commit 62dc771

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ end_of_line = crlf
1818
[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
1919
indent_size = 2
2020

21-
[*.lang]
21+
[*.{lang,md}]
2222
trim_trailing_whitespace = false

gtnhShared/spotless.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ spotless {
2020
toggleOffOn()
2121
importOrderFile(Blowdryer.file('spotless.importorder'))
2222
removeUnusedImports()
23-
eclipse('4.19.0').configFile(Blowdryer.file('spotless.eclipseformat.xml'))
23+
eclipse('4.19').configFile(Blowdryer.file('spotless.eclipseformat.xml'))
2424
}
2525
kotlin {
26-
target 'src/*/kotlin/**/*.kt'
26+
target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt'
2727

2828
toggleOffOn()
29-
ktfmt('0.39')
30-
3129
trimTrailingWhitespace()
32-
indentWithSpaces(4)
3330
endWithNewline()
31+
ktlint('1.7.1').editorConfigOverride([
32+
'ktlint_code_style': 'intellij_idea'
33+
])
3434
}
3535
scala {
3636
target 'src/*/scala/**/*.scala'
3737

38-
scalafmt('3.7.1')
38+
scalafmt('3.7.15')
3939
}
4040
}

0 commit comments

Comments
 (0)