diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..063e4a87410 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*.{kt,kts}] +ij_kotlin_allow_trailing_comma = false +ij_kotlin_allow_trailing_comma_on_call_site = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c1dc9dfe83..9628dd4e764 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ jmh = "1.36" junit4 = "4.13.2" junit4Osgi = "4.13.2_1" junit4Min = "4.12" -ktlint = "0.43.0" +ktlint = "0.48.2" log4j = "2.19.0" opentest4j = "1.2.0" openTestReporting = "0.1.0-M1" diff --git a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt index d283aad8eea..3386acf06b5 100644 --- a/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt +++ b/junit-jupiter-engine/src/test/kotlin/org/junit/jupiter/api/KotlinAssertionsTests.kt @@ -217,7 +217,8 @@ class KotlinAssertionsTests { vararg exceptionTypes: KClass ) = AssertAllAssertionsTests.assertExpectedExceptionTypes( - multipleFailuresError, *exceptionTypes.map { it.java }.toTypedArray() + multipleFailuresError, + *exceptionTypes.map { it.java }.toTypedArray() ) } }