Skip to content

Commit 9401815

Browse files
authored
Update ktfmt to 0.58 (#5885)
Newer Ktfmt versions require Java 17+, so I disabled some sensitive Ktfmt tests, when these run on lower JVM versions. Pull request: #5885
1 parent 0e768d8 commit 9401815

File tree

2 files changed

+35
-26
lines changed

2 files changed

+35
-26
lines changed

libs/kotlinlib/test/src/mill/kotlinlib/contrib/ktfmt/KtfmtModuleTests.scala

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,45 @@ object KtfmtModuleTests extends TestSuite {
2525
}
2626

2727
test("ktfmt - kotlin style") {
28-
assert(
29-
checkState(
30-
afterFormat(before, style = "kotlin"),
31-
after / "style/kotlin"
28+
if (!scala.util.Properties.isJavaAtLeast(17)) "Ktfmt requires Java 17"
29+
else
30+
assert(
31+
checkState(
32+
afterFormat(before, style = "kotlin"),
33+
after / "style/kotlin"
34+
)
3235
)
33-
)
3436
}
3537

3638
test("ktfmt - google style") {
37-
assert(
38-
checkState(
39-
afterFormat(before, style = "google"),
40-
after / "style/google"
39+
if (!scala.util.Properties.isJavaAtLeast(17)) "Ktfmt requires Java 17"
40+
else
41+
assert(
42+
checkState(
43+
afterFormat(before, style = "google"),
44+
after / "style/google"
45+
)
4146
)
42-
)
4347
}
4448

4549
test("ktfmt - meta style") {
46-
assert(
47-
checkState(
48-
afterFormat(before, style = "meta"),
49-
after / "style/meta"
50+
if (!scala.util.Properties.isJavaAtLeast(17)) "Ktfmt requires Java 17"
51+
else
52+
assert(
53+
checkState(
54+
afterFormat(before, style = "meta"),
55+
after / "style/meta"
56+
)
5057
)
51-
)
5258
}
5359

5460
test("ktfmt - dry-run") {
55-
checkState(
56-
afterFormat(before, format = true),
57-
before
58-
)
61+
if (!scala.util.Properties.isJavaAtLeast(17)) "Ktfmt requires Java 17"
62+
else
63+
checkState(
64+
afterFormat(before, format = true),
65+
before
66+
)
5967
}
6068

6169
test("ktfmt - don't remove unused imports") {
@@ -73,13 +81,14 @@ object KtfmtModuleTests extends TestSuite {
7381
}
7482

7583
test("formatAll") {
76-
77-
assert(
78-
checkState(
79-
afterFormatAll(before),
80-
after / "style/kotlin"
84+
if (!scala.util.Properties.isJavaAtLeast(17)) "Ktfmt requires Java 17"
85+
else
86+
assert(
87+
checkState(
88+
afterFormatAll(before),
89+
after / "style/kotlin"
90+
)
8191
)
82-
)
8392
}
8493
}
8594

mill-build/src/millbuild/Deps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ object Deps {
242242
val kotlinxHtmlJvm = mvn"org.jetbrains.kotlinx:kotlinx-html:0.11.0"
243243
val koverCli = mvn"org.jetbrains.kotlinx:kover-cli:$koverVersion"
244244
val koverJvmAgent = mvn"org.jetbrains.kotlinx:kover-jvm-agent:$koverVersion"
245-
val ktfmt = mvn"com.facebook:ktfmt:0.53"
245+
val ktfmt = mvn"com.facebook:ktfmt:0.58"
246246
val ktlint = mvn"com.pinterest.ktlint:ktlint-core:0.49.1"
247247
val palantirFormat = mvn"com.palantir.javaformat:palantir-java-format:2.74.0"
248248
val proguard = mvn"com.guardsquare:proguard-base:7.7.0"

0 commit comments

Comments
 (0)