Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rydde og forenkle gradleoppsett #5706

Merged
merged 7 commits into from
Sep 9, 2024
Merged

Rydde og forenkle gradleoppsett #5706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5f0560
Vi har berre kotlin-kode, så vi treng ikkje å konfigurere for java-ko…
madsop-nav Sep 5, 2024
32516ec
Cutterslade-analyze-pluginen har vi ikkje brukt på to år, så da kjem …
madsop-nav Sep 5, 2024
92a0d8b
Ser ikkje ut som vi treng å hente plugins frå JCenter-plugins-repoet,…
madsop-nav Sep 5, 2024
2c3c1bb
Tar bort avhengnadar vi har definert opp i toml-fila, men ikkje bruke…
madsop-nav Sep 5, 2024
501ef3f
Tar bort unødige linjeskift
madsop-nav Sep 5, 2024
aca3c99
Det er ikkje nokon grunn til at vi skal ha forskjellig rapportering a…
madsop-nav Sep 5, 2024
2834440
No var det ikkje lenger stort igjen i etterlatte-libs-mellomlaget i b…
madsop-nav Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -33,6 +34,14 @@ fun Project.setupRepositories() {
}
}
}
sub.tasks {
withType<Test> {
useJUnitPlatform()
testLogging {
events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
}
}
}
}
}

Expand Down
15 changes: 0 additions & 15 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
}

Expand All @@ -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
}
}
8 changes: 0 additions & 8 deletions buildSrc/src/main/kotlin/etterlatte.common.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestLogEvent

val libs = the<LibrariesForLibs>()

Expand Down Expand Up @@ -60,11 +59,4 @@ tasks {
}
}
}

withType<Test> {
useJUnitPlatform()
testLogging {
events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
}
}
}
10 changes: 0 additions & 10 deletions buildSrc/src/main/kotlin/etterlatte.libs.gradle.kts
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' }

Expand All @@ -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" }
Expand All @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-behandling-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-beregning-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-brev-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-funksjonsbrytere/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-institusjonsopphold-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}
2 changes: 1 addition & 1 deletion libs/etterlatte-jobs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-kafka/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-ktor/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-migrering-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-mq/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-oppgave-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-pdl-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
6 changes: 0 additions & 6 deletions libs/etterlatte-regler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ dependencies {
testRuntimeOnly(libs.test.jupiter.engine)
testImplementation(libs.test.kotest.assertionscore)
}

tasks {
withType<Test> {
useJUnitPlatform()
}
}
2 changes: 1 addition & 1 deletion libs/etterlatte-sporingslogg/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-tilbakekreving-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-trygdetid-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-utbetaling-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-vedtaksvurdering-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/etterlatte-vilkaarsvurdering-model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/rapidsandrivers-extras/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/saksbehandling-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("etterlatte.libs")
kotlin("jvm")
id("java-library")
id("java-test-fixtures")
}
Expand Down