Bump spotless til 7.0.0

navikt · Jan 7, 2025 · e71bfee · e71bfee
1 parent f0a6633
commit e71bfee
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,3 +3,5 @@ indent_size=4
 insert_final_newline=true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_standard_function-signature = disabled
+ktlint_standard_function-expression-body = disabled
diff --git a/auth-core/test/MicrosoftEntraIdTokenServiceTest.kt b/auth-core/test/MicrosoftEntraIdTokenServiceTest.kt
@@ -737,7 +737,8 @@ private enum class TestSystembrukerrolle : GenerellSystembrukerrolle {
 
 private data class TestSystembrukerroller(
     override val value: Set<TestSystembrukerrolle>,
-) : GenerellSystembrukerroller<TestSystembrukerrolle>, Set<TestSystembrukerrolle> by value {
+) : GenerellSystembrukerroller<TestSystembrukerrolle>,
+    Set<TestSystembrukerrolle> by value {
 
     constructor(vararg roller: TestSystembrukerrolle) : this(roller.toSet())
     constructor(roller: Collection<TestSystembrukerrolle>) : this(roller.toSet())

diff --git a/auth-test-core/main/no/nav/tiltakspenger/libs/auth/test/core/TestSystembruker.kt b/auth-test-core/main/no/nav/tiltakspenger/libs/auth/test/core/TestSystembruker.kt
@@ -37,7 +37,8 @@ enum class TestSystembrukerrolle : GenerellSystembrukerrolle {
 
 data class TestSystembrukerroller(
     override val value: Set<TestSystembrukerrolle>,
-) : GenerellSystembrukerroller<TestSystembrukerrolle>, Set<TestSystembrukerrolle> by value {
+) : GenerellSystembrukerroller<TestSystembrukerrolle>,
+    Set<TestSystembrukerrolle> by value {
 
     constructor(vararg roller: TestSystembrukerrolle) : this(roller.toSet())
     constructor(roller: Collection<TestSystembrukerrolle>) : this(roller.toSet())

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     kotlin("jvm") version "2.1.0"
     `maven-publish`
     `java-library`
-    id("com.diffplug.spotless") version "6.25.0"
+    id("com.diffplug.spotless") version "7.0.0"
 }
 
 allprojects {
@@ -41,6 +41,8 @@ subprojects {
                 .editorConfigOverride(
                     mapOf(
                         "ktlint_standard_max-line-length" to "off",
+                        "ktlint_standard_function-signature" to "disabled",
+                        "ktlint_standard_function-expression-body" to "disabled",
                     ),
                 )
         }

diff --git a/common/main/no/nav/tiltakspenger/libs/common/Saksbehandlerroller.kt b/common/main/no/nav/tiltakspenger/libs/common/Saksbehandlerroller.kt
@@ -2,7 +2,8 @@ package no.nav.tiltakspenger.libs.common
 
 data class Saksbehandlerroller(
     override val value: Set<Saksbehandlerrolle>,
-) : Roller<Saksbehandlerrolle>, Set<Saksbehandlerrolle> by value {
+) : Roller<Saksbehandlerrolle>,
+    Set<Saksbehandlerrolle> by value {
 
     constructor(vararg roller: Saksbehandlerrolle) : this(roller.toSet())
     constructor(roller: Collection<Saksbehandlerrolle>) : this(roller.toSet())

diff --git a/...st/no/nav/tiltakspenger/libs/persistering/infrastruktur/PostgresTransactionContextTest.kt b/...st/no/nav/tiltakspenger/libs/persistering/infrastruktur/PostgresTransactionContextTest.kt
@@ -109,8 +109,7 @@ internal class PostgresTransactionContextTest {
 
     @Test
     fun rollback() {
-        PostgresSessionContext(dataSource, sessionCounter).withSession {
-                session ->
+        PostgresSessionContext(dataSource, sessionCounter).withSession { session ->
             session.run(
                 queryOf("create table rollback (test varchar not null)").asExecute,
             )