Rydd opp i compiler warnings og ktlint

.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

auth-core/build.gradle.kts

@@ -16,8 +16,3 @@ dependencies {
 
     testImplementation(project(":test-common"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

auth-ktor/build.gradle.kts

@@ -34,8 +34,3 @@ dependencies {
 
 
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

auth-test-core/build.gradle.kts

@@ -11,8 +11,3 @@ dependencies {
     api("com.auth0:java-jwt:4.4.0")
     api("com.auth0:jwks-rsa:0.22.1")
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

build.gradle.kts

@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val javaVersion = JavaVersion.VERSION_21
@@ -27,29 +28,41 @@ subprojects {
     apply(plugin = "java-library")
     apply(plugin = "com.diffplug.spotless")
 
+    dependencies {
+        testImplementation(platform("org.junit:junit-bom:5.11.4"))
+        testImplementation("org.junit.jupiter:junit-jupiter")
+        testImplementation("org.junit.jupiter:junit-jupiter-params")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    }
+
     spotless {
         kotlin {
-            ktlint("0.48.2")
+            ktlint()
+                .editorConfigOverride(
+                    mapOf(
+                        "ktlint_standard_max-line-length" to "off",
+                    ),
+                )
         }
     }
 
     tasks {
-        compileKotlin {
-            compilerOptions {
-                jvmTarget.set(jvmVersion)
-            }
-        }
-        compileTestKotlin {
+        kotlin {
             compilerOptions {
                 jvmTarget.set(jvmVersion)
-                freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+                freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility")
             }
         }
         test {
             // JUnit 5 support
             useJUnitPlatform()
             // https://phauer.com/2018/best-practices-unit-testing-kotlin/
             systemProperty("junit.jupiter.testinstance.lifecycle.default", "per_class")
+            testLogging {
+                // We only want to log failed and skipped tests when running Gradle.
+                events("skipped", "failed")
+                exceptionFormat = TestExceptionFormat.FULL
+            }
         }
         withType<Jar> {
             duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -90,6 +103,11 @@ subprojects {
     sourceSets["test"].resources.srcDirs("test")
 }
 
+configurations.all {
+    // exclude JUnit 4
+    exclude(group = "junit", module = "junit")
+}
+
 tasks {
     register<Copy>("addPreCommitGitHookOnBuild") {
         if (System.getenv()["GITHUB_ACTIONS"] == "true") {

common/build.gradle.kts

@@ -7,8 +7,3 @@ dependencies {
 
     testImplementation(project(":test-common"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

datadeling-dtos/build.gradle.kts

@@ -1,8 +1,3 @@
 dependencies {
     implementation(project(":json"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

jobber/build.gradle.kts

@@ -8,8 +8,3 @@ dependencies {
 
     testImplementation(project(":test-common"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

jobber/main/no/nav/tiltakspenger/libs/jobber/StoppableJob.kt

@@ -110,11 +110,17 @@ private fun startStoppableJob(
     return scheduleJob {
         Either.catch {
             if (runJobCheck.shouldRun()) {
-                if (enableDebuggingLogging) { log.debug("Kjører skeduleringsjobb '$jobName'.") }
+                if (enableDebuggingLogging) {
+                    log.debug("Kjører skeduleringsjobb '$jobName'.")
+                }
                 withCorrelationId(log, mdcCallIdKey) { job(it) }
-                if (enableDebuggingLogging) { log.debug("Fullførte skeduleringsjobb '$jobName'.") }
+                if (enableDebuggingLogging) {
+                    log.debug("Fullførte skeduleringsjobb '$jobName'.")
+                }
             } else {
-                if (enableDebuggingLogging) { log.debug("Skeduleringsjobb '$jobName' kjører ikke pga. startKriterier i runJobCheck. Eksempelvis er vi ikke leader pod.") }
+                if (enableDebuggingLogging) {
+                    log.debug("Skeduleringsjobb '$jobName' kjører ikke pga. startKriterier i runJobCheck. Eksempelvis er vi ikke leader pod.")
+                }
             }
         }.onLeft {
             log.error(

json/build.gradle.kts

@@ -9,8 +9,3 @@ dependencies {
 
     testImplementation(project(":test-common"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

ktor-common/build.gradle.kts

@@ -13,8 +13,3 @@ dependencies {
     testImplementation(project(":test-common"))
 
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

ktor-test-common/build.gradle.kts

@@ -18,8 +18,3 @@ dependencies {
     testImplementation(project(":test-common"))
 
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

logging/build.gradle.kts

@@ -3,8 +3,3 @@ dependencies {
 
     testImplementation(project(":test-common"))
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/Periode_tilstøterTest.kt → periodisering/test/no/nav/tiltakspenger/libs/periodisering/periode/PeriodeTilstøterTest.kt

@@ -7,7 +7,7 @@ import no.nav.tiltakspenger.libs.periodisering.tilstøter
 import org.junit.jupiter.api.Test
 import java.time.LocalDate
 
-internal class Periode_tilstøterTest {
+internal class PeriodeTilstøterTest {
 
     @Test
     fun `ingen elementer gir true`() {

persistering/persistering-domene/build.gradle.kts

@@ -6,11 +6,6 @@ dependencies {
     testImplementation(project(":test-common"))
 }
 
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}
-
 tasks.withType<Jar> {
     archiveBaseName.set("persistering-domene")
 }

persistering/persistering-infrastruktur/build.gradle.kts

@@ -19,11 +19,6 @@ dependencies {
     testImplementation("org.postgresql:postgresql:42.7.4")
 }
 
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}
-
 tasks.withType<Jar> {
     archiveBaseName.set("persistering-infrastruktur")
 }

personklient/personklient-domene/build.gradle.kts

@@ -4,11 +4,6 @@ dependencies {
     implementation("io.arrow-kt:arrow-core:1.2.4")
 }
 
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}
-
 tasks.withType<Jar> {
     archiveBaseName.set("personklient-domene")
 }

personklient/personklient-infrastruktur/build.gradle.kts

@@ -12,11 +12,6 @@ dependencies {
     testImplementation(project(":test-common"))
 }
 
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}
-
 tasks.withType<Jar> {
     archiveBaseName.set("personklient-infrastruktur")
 }

personklient/personklient-infrastruktur/main/no/nav/tiltakspenger/libs/personklient/tilgangsstyring/TilgangsstyringServiceImpl.kt

@@ -144,7 +144,6 @@ class TilgangsstyringServiceImpl(
                 timeout = timeout,
                 sikkerlogg = sikkerlogg,
             ),
-
         ): TilgangsstyringService {
             return TilgangsstyringServiceImpl(
                 fellesPersonTilgangsstyringsklient = fellesPersonTilgangsstyringsklient,

test-common/build.gradle.kts

@@ -13,6 +13,8 @@ dependencies {
 
     api(platform("org.junit:junit-bom:5.11.4"))
     api("org.junit.jupiter:junit-jupiter")
+    api("org.junit.jupiter:junit-jupiter-params")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     api("io.mockk:mockk:$mockkVersion")
     api("io.mockk:mockk-dsl-jvm:$mockkVersion")
@@ -24,8 +26,3 @@ dependencies {
 
     api("ch.qos.logback:logback-classic:1.5.14")
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}

tiltak-dtos/build.gradle.kts

@@ -1,8 +1,3 @@
 dependencies {
     implementation("io.arrow-kt:arrow-core:1.2.4")
 }
-
-configurations.all {
-    // exclude JUnit 4
-    exclude(group = "junit", module = "junit")
-}