Skip to content

Commit 3a3dd7d

Browse files
committed
Upgrades
- kotlin upgrade to 2.0.21 - github actions java-version set to 23 - Spring boot 3.4.1 to 3.4.4 - kover version 0.76 to 0.9.1 - java compatibility set to 21 - spring oauth from 6.4.2 to 6.4.4 - redis om spring from 0.9.1 to 0.9.10 - detekt from 1.23.7 to 1.23.8 - junit from 5.10.0 to 5.12.1 - remove ai.djl:api constraints on redis-om-spring dependency
1 parent 750db9e commit 3a3dd7d

File tree

5 files changed

+41
-29
lines changed

5 files changed

+41
-29
lines changed

.github/workflows/build_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'temurin'
24-
java-version: '21'
24+
java-version: '23'
2525

2626
- name: Setup Gradle
2727
uses: gradle/actions/setup-gradle@v4
@@ -88,7 +88,7 @@ jobs:
8888
uses: actions/setup-java@v4
8989
with:
9090
distribution: 'temurin'
91-
java-version: '21'
91+
java-version: '23'
9292

9393
- name: Setup Gradle
9494
if: ${{ endsWith(steps.previoustag.outputs.tag, '-SNAPSHOT') }}

.github/workflows/detekt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-java@v4
2929
with:
3030
distribution: 'temurin'
31-
java-version: '21'
31+
java-version: '23'
3232

3333
- name: Setup Gradle
3434
uses: gradle/actions/setup-gradle@v4

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
distribution: 'temurin'
27-
java-version: '21'
27+
java-version: '23'
2828

2929
- name: Setup Gradle
3030
uses: gradle/actions/setup-gradle@v4

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'temurin'
24-
java-version: '21'
24+
java-version: '23'
2525

2626
- name: Setup Gradle
2727
uses: gradle/actions/setup-gradle@v4

build.gradle.kts

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
// Licensed under the MIT license.
33
import com.diffplug.gradle.spotless.SpotlessExtension
44
import io.gitlab.arturbosch.detekt.Detekt
5+
import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
56
import org.gradle.kotlin.dsl.implementation
67

78
plugins {
8-
val kotlinVersion = "1.9.23"
9+
val kotlinVersion = "2.0.21"
910
kotlin("jvm") version kotlinVersion
1011
id("com.diffplug.spotless") version "7.0.2"
11-
id("org.springframework.boot") version "3.4.1" apply false
12+
id("org.springframework.boot") version "3.4.4" apply false
1213
id("io.gitlab.arturbosch.detekt") version "1.23.8"
1314
id("pl.allegro.tech.build.axion-release") version "1.18.18"
14-
id("org.jetbrains.kotlinx.kover") version "0.7.6"
15+
id("org.jetbrains.kotlinx.kover") version "0.9.1"
1516
id("project-report")
1617
`maven-publish`
1718
// Apply the java-library plugin for API and implementation separation.
@@ -28,7 +29,11 @@ project.version = scmVersion.version
2829

2930
val kotlinJvmTarget = 21
3031

31-
java { toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) } }
32+
java {
33+
targetCompatibility = JavaVersion.VERSION_21
34+
sourceCompatibility = JavaVersion.VERSION_21
35+
toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) }
36+
}
3237

3338
publishing {
3439
repositories {
@@ -155,28 +160,30 @@ val springWebVersion = "6.2.1"
155160
val springBootVersion = "3.4.1"
156161

157162
// Implementation
158-
val swaggerParserVersion = "2.1.24"
163+
val swaggerParserVersion = "2.1.25"
159164
val hashidsVersion = "1.0.3"
160165
val springOauthAutoConfigureVersion = "2.6.8"
161166
val springSecurityJwtVersion = "1.1.1.RELEASE"
162167
val springDocVersion = "2.8.6"
163-
val springOauthVersion = "6.4.2"
168+
val springOauthVersion = "6.4.4"
164169
val servletApiVersion = "6.1.0"
165170
val oktaSpringBootVersion = "3.0.7"
166171
val tikaVersion = "3.1.0"
167-
val redisOMVersion = "0.9.1"
168-
val kotlinCoroutinesCoreVersion = "1.8.1"
172+
val redisOMVersion = "0.9.10"
173+
val kotlinCoroutinesCoreVersion = "1.10.2"
169174

170175
// Checks
171-
val detektVersion = "1.23.7"
176+
val detektVersion = "1.23.8"
172177

173178
// Tests
174-
val jUnitBomVersion = "5.10.0"
179+
val jUnitBomVersion = "5.12.1"
175180
val mockkVersion = "1.13.17"
176-
val awaitilityKVersion = "4.2.2"
181+
val awaitilityKVersion = "4.3.0"
177182
val testcontainersRedis = "1.6.4"
178183

179184
dependencies {
185+
// https://youtrack.jetbrains.com/issue/KT-71057/POM-file-unusable-after-upgrading-to-2.0.20-from-2.0.10
186+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
180187
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
181188

182189
detekt("io.gitlab.arturbosch.detekt:detekt-cli:$detektVersion")
@@ -213,7 +220,7 @@ dependencies {
213220
}
214221

215222
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}")
216-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3")
223+
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
217224

218225
implementation("jakarta.servlet:jakarta.servlet-api:${servletApiVersion}")
219226
implementation("com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion}")
@@ -224,9 +231,7 @@ dependencies {
224231

225232
implementation("org.apache.tika:tika-core:${tikaVersion}")
226233
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesCoreVersion")
227-
implementation("com.redis.om:redis-om-spring:${redisOMVersion}") {
228-
constraints { implementation("ai.djl:api:0.28.0") }
229-
}
234+
implementation("com.redis.om:redis-om-spring:${redisOMVersion}")
230235

231236
implementation("com.redis.testcontainers:testcontainers-redis-junit:$testcontainersRedis")
232237
implementation("org.springframework.boot:spring-boot-starter-test")
@@ -246,16 +251,23 @@ dependencies {
246251
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
247252
}
248253

249-
extensions.configure<kotlinx.kover.gradle.plugin.dsl.KoverReportExtension> {
250-
defaults {
251-
// reports configs for XML, HTML, verify reports
254+
extensions.configure<KoverProjectExtension>("kover") {
255+
reports {
256+
filters {
257+
includes {
258+
packages("com.cosmotech.api")
259+
classes("com.cosmotech.api.id.*")
260+
classes("com.cosmotech.api.rbac.*")
261+
classes("com.cosmotech.utils.*")
262+
}
263+
}
252264
}
253-
filters {
254-
includes {
255-
packages("com.cosmotech.api")
256-
classes("com.cosmotech.api.id.*")
257-
classes("com.cosmotech.api.rbac.*")
258-
classes("com.cosmotech.utils.*")
265+
}
266+
267+
kover {
268+
reports {
269+
total {
270+
// reports configs for XML, HTML, verify reports
259271
}
260272
}
261273
}

0 commit comments

Comments
 (0)