diff --git a/service/build.gradle.kts b/service/build.gradle.kts index c508c035b9f..941ce7a6a84 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -2,18 +2,14 @@ // // SPDX-License-Identifier: LGPL-2.1-or-later +import java.util.regex.Pattern import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.springframework.boot.gradle.tasks.bundling.BootJar -import java.util.regex.Pattern buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath(libs.flyway.database.postgresql) - } + repositories { mavenCentral() } + dependencies { classpath(libs.flyway.database.postgresql) } } plugins { @@ -38,20 +34,15 @@ sourceSets { } } -val integrationTestImplementation: Configuration by configurations.getting { - extendsFrom(configurations.testImplementation.get()) -} +val integrationTestImplementation: Configuration by + configurations.getting { extendsFrom(configurations.testImplementation.get()) } -val downloadOnly: Configuration by configurations.creating { - isTransitive = false -} +val downloadOnly: Configuration by configurations.creating { isTransitive = false } configurations["integrationTestRuntimeOnly"].extendsFrom(configurations.testRuntimeOnly.get()) idea { - module { - testSources = testSources + sourceSets["integrationTest"].kotlin.sourceDirectories - } + module { testSources = testSources + sourceSets["integrationTest"].kotlin.sourceDirectories } } dependencies { @@ -80,9 +71,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-jdbc") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-web-services") - implementation("org.springframework.ws:spring-ws-security") { - exclude("org.opensaml") - } + implementation("org.springframework.ws:spring-ws-security") { exclude("org.opensaml") } implementation("org.springframework.ws:spring-ws-support") { exclude("org.eclipse.angus", "angus-mail") } @@ -163,9 +152,7 @@ dependencies { integrationTestImplementation("org.apache.cxf:cxf-rt-frontend-jaxws") integrationTestImplementation("org.apache.cxf:cxf-rt-transports-http") integrationTestImplementation("org.apache.cxf:cxf-rt-transports-http-jetty") - integrationTestImplementation("org.apache.cxf:cxf-rt-ws-security") { - exclude("org.opensaml") - } + integrationTestImplementation("org.apache.cxf:cxf-rt-ws-security") { exclude("org.opensaml") } implementation(project(":sficlient")) implementation(project(":vtjclient")) @@ -175,9 +162,7 @@ dependencies { downloadOnly(libs.dd.java.agent) } -allOpen { - annotation("org.springframework.boot.test.context.TestConfiguration") -} +allOpen { annotation("org.springframework.boot.test.context.TestConfiguration") } allprojects { tasks.withType { @@ -195,9 +180,7 @@ allprojects { tasks.withType { useJUnitPlatform() - filter { - isFailOnNoMatchingTests = false - } + filter { isFailOnNoMatchingTests = false } } tasks.register("resolveDependencies") { @@ -206,8 +189,8 @@ allprojects { configurations .matching { it.isCanBeResolved && - // ignore configurations that fetch sources (e.g. Java source code) - !it.name.endsWith("dependencySources", ignoreCase = true) + // ignore configurations that fetch sources (e.g. Java source code) + !it.name.endsWith("dependencySources", ignoreCase = true) } .map { val files = it.resolve() @@ -224,18 +207,12 @@ allprojects { } } -tasks.getByName("jar") { - archiveClassifier.set("") -} +tasks.getByName("jar") { archiveClassifier.set("") } -tasks.getByName("bootJar") { - archiveClassifier.set("boot") -} +tasks.getByName("bootJar") { archiveClassifier.set("boot") } tasks { - test { - systemProperty("spring.profiles.active", "test") - } + test { systemProperty("spring.profiles.active", "test") } register("integrationTest", Test::class) { useJUnitPlatform() @@ -294,10 +271,6 @@ tasks { } } -ktfmt { - kotlinLangStyle() -} +ktfmt { kotlinLangStyle() } -ktlint { - version.set(libs.versions.ktlint.asProvider().get()) -} +ktlint { version.set(libs.versions.ktlint.asProvider().get()) } diff --git a/service/codegen/build.gradle.kts b/service/codegen/build.gradle.kts index 72ce72f5ab8..5365c2ec78b 100644 --- a/service/codegen/build.gradle.kts +++ b/service/codegen/build.gradle.kts @@ -42,10 +42,6 @@ tasks { } } -ktfmt { - kotlinLangStyle() -} +ktfmt { kotlinLangStyle() } -ktlint { - version.set(libs.versions.ktlint.asProvider().get()) -} +ktlint { version.set(libs.versions.ktlint.asProvider().get()) } diff --git a/service/custom-ktlint-rules/build.gradle.kts b/service/custom-ktlint-rules/build.gradle.kts index c35bbed344d..31a08b3ff04 100644 --- a/service/custom-ktlint-rules/build.gradle.kts +++ b/service/custom-ktlint-rules/build.gradle.kts @@ -25,10 +25,6 @@ dependencies { testImplementation("com.pinterest.ktlint:ktlint-test") } -ktfmt { - kotlinLangStyle() -} +ktfmt { kotlinLangStyle() } -ktlint { - version.set(libs.versions.ktlint.asProvider().get()) -} +ktlint { version.set(libs.versions.ktlint.asProvider().get()) } diff --git a/service/gradle/libs.versions.toml b/service/gradle/libs.versions.toml index 84a81016a8d..b28dad49357 100644 --- a/service/gradle/libs.versions.toml +++ b/service/gradle/libs.versions.toml @@ -10,7 +10,7 @@ flyway = "11.3.0" fuel = "2.3.1" java = "21" kotlin = "2.1.0" -ktfmt = "0.21.0" +ktfmt = "0.22.0" ktlint = "1.5.0" ktlint-gradle = "12.1.0" mockito = "5.15.2" diff --git a/service/settings.gradle.kts b/service/settings.gradle.kts index bd5578688f8..def85feb1b7 100644 --- a/service/settings.gradle.kts +++ b/service/settings.gradle.kts @@ -3,11 +3,17 @@ // SPDX-License-Identifier: LGPL-2.1-or-later rootProject.name = "evaka-service" + include("service-lib") + include("vtjclient") + include("sficlient") + include("evaka-bom") + include("codegen") + include("custom-ktlint-rules") dependencyResolutionManagement {