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

build(deps): bump kotlin from 2.0.21 to 2.1.0 #189

Merged
merged 4 commits into from
Jan 2, 2025
Merged

build(deps): bump kotlin from 2.0.21 to 2.1.0 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97ba1da
build(deps): bump kotlin from 2.0.21 to 2.1.0
dependabot[bot] Dec 18, 2024
dc06982
chore(deps): use version "1.5.0" of klint
eliflores Jan 2, 2025
82928fe
chore(deps): use version "1.5.0" of klint
eliflores Jan 2, 2025
934741a
Merge remote-tracking branch 'origin/main' into dependabot/gradle/kot…
eliflores Jan 2, 2025
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
7 changes: 4 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ reporting {
reportTask {
executionData.from(
configurations["aggregateCodeCoverageReportResults"]
.incoming.artifactView {
.incoming
.artifactView {
lenient(true)
withVariantReselection()
attributes {
Expand All @@ -197,10 +198,10 @@ sonar {

spotless {
kotlin {
ktlint()
ktlint("1.5.0")
}
kotlinGradle {
ktlint()
ktlint("1.5.0")
}
format("misc") {
target(
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
# @keep
jacoco = "0.8.12"
kotlin = "2.0.21"
kotlin = "2.1.0"
spring-boot = "3.4.1"

[libraries]
Expand Down
7 changes: 6 additions & 1 deletion src/integrationTest/kotlin/de/bund/digitalservice/template/HealthEndpointIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ class HealthEndpointIntegrationTest(
) {
@Test
fun `should expose health endpoint`() {
webTestClient.get().uri("/actuator/health").exchange().expectStatus().isOk()
webTestClient
.get()
.uri("/actuator/health")
.exchange()
.expectStatus()
.isOk()
}
}
7 changes: 6 additions & 1 deletion src/integrationTest/kotlin/de/bund/digitalservice/template/HelloWorldIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ class HelloWorldIntegrationTest(
) {
@Test
fun `should expose hello world`() {
webTestClient.get().uri("/").exchange().expectStatus().isOk()
webTestClient
.get()
.uri("/")
.exchange()
.expectStatus()
.isOk()
}
}
9 changes: 6 additions & 3 deletions src/integrationTest/kotlin/de/bund/digitalservice/template/SecurityTxtIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ class SecurityTxtIntegrationTest(
@Test
fun `should expose security txt at well known location`() {
getSecurityTxt()
.expectStatus().isOk()
.expectHeader().contentType(MediaType.TEXT_PLAIN)
.expectBody().consumeWith { response ->
.expectStatus()
.isOk()
.expectHeader()
.contentType(MediaType.TEXT_PLAIN)
.expectBody()
.consumeWith { response ->
Assertions.assertThat(response.responseBody).isNotEmpty
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/de/bund/digitalservice/template/config/SecurityConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import org.springframework.security.web.server.SecurityWebFilterChain
@EnableWebFluxSecurity
class SecurityConfig {
@Bean
fun springSecurityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
return http.invoke {
fun springSecurityWebFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain =
http.invoke {
authorizeExchange {
authorize("/.well-known/security.txt", permitAll)
authorize("/actuator/health", permitAll)
Expand All @@ -21,5 +21,4 @@ class SecurityConfig {
authorize(anyExchange, denyAll)
}
}
}
}
Loading