Rydde og forenkle gradleoppsett (#5706)

* Vi har berre kotlin-kode, så vi treng ikkje å konfigurere for java-kompilering

* Cutterslade-analyze-pluginen har vi ikkje brukt på to år, så da kjem vi vel ikkje til å bruke han heller, så ryddar han bort

* Ser ikkje ut som vi treng å hente plugins frå JCenter-plugins-repoet, så tar det bort

* Tar bort avhengnadar vi har definert opp i toml-fila, men ikkje bruker i verken libs eller apps

* Tar bort unødige linjeskift

* Det er ikkje nokon grunn til at vi skal ha forskjellig rapportering av testresultat mellom dei forskjellige modulane, så standardiserer og definerer det kun på toppnivå

* No var det ikkje lenger stort igjen i etterlatte-libs-mellomlaget i buildsrc, så da kan vi like godt ta det bort, og sleppe litt kognitiv last

.github/dependabot.yml

@@ -35,7 +35,6 @@ updates:
           - "ch.qos.logback*"
           - "net.logstash*"
           - "com.github.navikt:rapids-and-rivers"
-          - "ca.cutterslade.analyze"
           - "io.ktor*"
           - "org.jetbrains.kotlinx*"
           - "org.apache.commons:commons-compress"

build.gradle.kts

@@ -1,5 +1,6 @@
 import com.github.jk1.license.render.InventoryReportRenderer
 import com.github.jk1.license.render.JsonReportRenderer
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 setupRepositories()
 setupTestLogging()
@@ -33,6 +34,14 @@ fun Project.setupRepositories() {
                 }
             }
         }
+        sub.tasks {
+            withType<Test> {
+                useJUnitPlatform()
+                testLogging {
+                    events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
+                }
+            }
+        }
     }
 }
 

buildSrc/build.gradle.kts

@@ -1,26 +1,19 @@
-import ca.cutterslade.gradle.analyze.AnalyzeDependenciesTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("jvm") version "2.0.20"
     `kotlin-dsl`
-    alias(libs.plugins.cutterslade.analyze) apply true
 }
 
 group = "no.nav.etterlatte"
 version = "unspecified"
 
 repositories {
     gradlePluginPortal()
-    maven(
-        // name = "JCenter Gradle Plugins",
-        url = "https://dl.bintray.com/gradle/gradle-plugins",
-    )
 }
 
 dependencies {
     implementation(kotlin("gradle-plugin"))
-
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
 
@@ -33,12 +26,4 @@ tasks {
             jvmTarget.set(JvmTarget.JVM_21)
         }
     }
-    java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-    withType<AnalyzeDependenciesTask> {
-        warnUsedUndeclared = true
-        warnUnusedDeclared = true
-    }
 }

buildSrc/src/main/kotlin/etterlatte.common.gradle.kts

@@ -1,6 +1,5 @@
 
 import org.gradle.accessors.dm.LibrariesForLibs
-import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 val libs = the<LibrariesForLibs>()
 
@@ -60,11 +59,4 @@ tasks {
             }
         }
     }
-
-    withType<Test> {
-        useJUnitPlatform()
-        testLogging {
-            events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
-        }
-    }
 }

gradle/libs.versions.toml

@@ -1,6 +1,5 @@
 [plugins]
 avro = { id = "com.github.davidmc24.gradle.plugin.avro", version = "1.9.1" }
-cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.10.0" }
 versions = { id = "se.ascp.gradle.gradle-versions-filter", version = "0.1.16" }
 license = { id = 'com.github.jk1.dependency-license-report', version = '2.9' }
 
@@ -25,7 +24,6 @@ database-kotliquery = { module = "com.github.seratch:kotliquery", version = "1.9
 jackson-datatypejsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson-version" }
 jackson-datatypejdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson-version" }
 jackson-modulekotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-version" }
-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-version" }
 
 kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.8.0" }
 kafka-avro = { module = "org.apache.avro:avro", version = "1.12.0" }
@@ -39,10 +37,6 @@ ktor2-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor2-ver
 ktor2-clientcore = { module = "io.ktor:ktor-client-core", version.ref = "ktor2-version" }
 ktor2-clientloggingjvm = { module = "io.ktor:ktor-client-logging-jvm", version.ref = "ktor2-version" }
 ktor2-clientauth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor2-version" }
-ktor2-clientjackson = { module = "io.ktor:ktor-client-jackson", version.ref = "ktor2-version" }
-ktor2-clientlogging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor2-version" }
-ktor2-clientciojvm = { module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor2-version" }
-ktor2-servercore = { module = "io.ktor:ktor-server-core", version.ref = "ktor2-version" }
 ktor2-servercorejvm = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor2-version" }
 ktor2-doublereceive = { module = "io.ktor:ktor-server-double-receive", version.ref = "ktor2-version" }
 ktor2-servercio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor2-version" }

libs/etterlatte-behandling-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-beregning-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-brev-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-database/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }

libs/etterlatte-funksjonsbrytere/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }

libs/etterlatte-institusjonsopphold-model/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }

libs/etterlatte-jobs/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-kafka/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }

libs/etterlatte-ktor/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }

libs/etterlatte-migrering-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-mq/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }

libs/etterlatte-oppgave-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-pdl-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-regler/build.gradle.kts

@@ -11,9 +11,3 @@ dependencies {
     testRuntimeOnly(libs.test.jupiter.engine)
     testImplementation(libs.test.kotest.assertionscore)
 }
-
-tasks {
-    withType<Test> {
-        useJUnitPlatform()
-    }
-}

libs/etterlatte-sporingslogg/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-tilbakekreving-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-trygdetid-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-utbetaling-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-vedtaksvurdering-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/etterlatte-vilkaarsvurdering-model/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/rapidsandrivers-extras/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
 }
 
 dependencies {

libs/saksbehandling-common/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("etterlatte.libs")
+    kotlin("jvm")
     id("java-library")
     id("java-test-fixtures")
 }