Skip to content

Commit 3bc5c69

Browse files
jreynard-codejreynard-code
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.7.4 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 - kotlin coroutines from 1.8.1 to 1.10.2 - junit from 5.10.0 to 5.12.1 - remove ai.djl:api constraints on redis-om-spring dependency
1 parent 6d91c0a commit 3bc5c69

File tree

19 files changed

+50
-42
lines changed

19 files changed

+50
-42
lines changed

‎.github/workflows/build_test_package.yml‎

Lines changed: 6 additions & 6 deletions
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
@@ -86,7 +86,7 @@ jobs:
8686
uses: actions/setup-java@v4
8787
with:
8888
distribution: 'temurin'
89-
java-version: '21'
89+
java-version: '23'
9090

9191
- name: Setup Gradle
9292
uses: gradle/actions/setup-gradle@v4
@@ -116,7 +116,7 @@ jobs:
116116
uses: actions/setup-java@v4
117117
with:
118118
distribution: 'temurin'
119-
java-version: '21'
119+
java-version: '23'
120120

121121
- name: Setup Gradle
122122
uses: gradle/actions/setup-gradle@v4
@@ -166,7 +166,7 @@ jobs:
166166
uses: actions/setup-java@v4
167167
with:
168168
distribution: 'temurin'
169-
java-version: '21'
169+
java-version: '23'
170170

171171
- name: Setup Gradle
172172
uses: gradle/actions/setup-gradle@v4
@@ -221,7 +221,7 @@ jobs:
221221
uses: actions/setup-java@v4
222222
with:
223223
distribution: 'temurin'
224-
java-version: '21'
224+
java-version: '23'
225225

226226
- name: Set up api version to deploy
227227
run: |
@@ -420,7 +420,7 @@ jobs:
420420
uses: actions/setup-java@v4
421421
with:
422422
distribution: "temurin"
423-
java-version: "21"
423+
java-version: "23"
424424

425425
- name: Retrieve branch or tag name
426426
id: refvar

‎.github/workflows/doc.yml‎

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

3131
- name: Setup Gradle
3232
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'temurin'
30-
java-version: '21'
30+
java-version: '23'
3131

3232
- name: Setup Gradle
3333
uses: gradle/actions/setup-gradle@v4
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/setup-java@v4
5252
with:
5353
distribution: 'temurin'
54-
java-version: '21'
54+
java-version: '23'
5555

5656
- name: Setup Gradle
5757
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/openapi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/setup-java@v4
4040
with:
4141
distribution: 'temurin'
42-
java-version: '21'
42+
java-version: '23'
4343

4444
- name: Setup Gradle
4545
uses: gradle/actions/setup-gradle@v4

‎.github/workflows/openapi_clients.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/setup-java@v4
4242
with:
4343
distribution: 'temurin'
44-
java-version: '21'
44+
java-version: '23'
4545

4646
- name: Setup Gradle
4747
uses: gradle/actions/setup-gradle@v4

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestBase.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.cosmotech.run.domain.Run
88
import com.cosmotech.runner.domain.Runner
99
import com.cosmotech.solution.domain.Solution
1010
import com.cosmotech.workspace.domain.Workspace
11-
import com.redis.om.spring.RediSearchIndexer
11+
import com.redis.om.spring.indexing.RediSearchIndexer
1212
import com.redis.testcontainers.RedisServer
1313
import com.redis.testcontainers.RedisStackContainer
1414
import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase

‎build.gradle.kts‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.github.jk1.license.task.ReportTask
77
import com.google.cloud.tools.jib.api.buildplan.ImageFormat.OCI
88
import com.google.cloud.tools.jib.gradle.JibExtension
99
import io.gitlab.arturbosch.detekt.Detekt
10+
import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
1011
import org.apache.tools.ant.filters.ReplaceTokens
1112
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
1213
import org.gradle.api.tasks.testing.logging.TestLogEvent
@@ -32,16 +33,16 @@ buildscript {
3233
}
3334

3435
plugins {
35-
val kotlinVersion = "1.9.23"
36+
val kotlinVersion = "2.0.21"
3637
kotlin("jvm") version kotlinVersion
3738
kotlin("plugin.spring") version kotlinVersion apply false
3839
id("pl.allegro.tech.build.axion-release") version "1.18.18"
3940
id("com.diffplug.spotless") version "7.0.2"
40-
id("org.springframework.boot") version "3.4.1" apply false
41+
id("org.springframework.boot") version "3.4.4" apply false
4142
id("project-report")
4243
id("org.owasp.dependencycheck") version "12.1.0"
4344
id("com.github.jk1.dependency-license-report") version "2.9"
44-
id("org.jetbrains.kotlinx.kover") version "0.7.4"
45+
id("org.jetbrains.kotlinx.kover") version "0.9.1"
4546
id("io.gitlab.arturbosch.detekt") version "1.23.8"
4647
id("org.openapi.generator") version "7.10.0" apply false
4748
id("com.google.cloud.tools.jib") version "3.4.5" apply false
@@ -65,7 +66,7 @@ val cosmotechApiCommonVersion = "2.1.0-SNAPSHOT"
6566
val jedisVersion = "4.4.6"
6667
val springOauthVersion = "6.4.2"
6768
val redisOmSpringVersion = "0.9.7"
68-
val kotlinCoroutinesCoreVersion = "1.8.1"
69+
val kotlinCoroutinesCoreVersion = "1.10.2"
6970
val kotlinCoroutinesTestVersion = "1.7.3"
7071
val oktaSpringBootVersion = "3.0.7"
7172
val springDocVersion = "2.8.6"
@@ -83,7 +84,7 @@ val commonCompressVersion = "1.27.1"
8384
val awsSpringVersion = "3.1.1"
8485

8586
// Checks
86-
val detektVersion = "1.23.7"
87+
val detektVersion = "1.23.8"
8788

8889
// Tests
8990
val jUnitBomVersion = "5.10.0"
@@ -139,7 +140,7 @@ allprojects {
139140
sourceCompatibility = JavaVersion.VERSION_21
140141
toolchain { languageVersion.set(JavaLanguageVersion.of(kotlinJvmTarget)) }
141142
}
142-
configurations { all { resolutionStrategy { force("com.redis.om:redis-om-spring:0.9.1") } } }
143+
configurations { all { resolutionStrategy { force("com.redis.om:redis-om-spring:0.9.10") } } }
143144

144145
repositories {
145146
maven {
@@ -271,6 +272,8 @@ subprojects {
271272
}
272273

273274
dependencies {
275+
// https://youtrack.jetbrains.com/issue/KT-71057/POM-file-unusable-after-upgrading-to-2.0.20-from-2.0.10
276+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
274277
detekt("io.gitlab.arturbosch.detekt:detekt-cli:$detektVersion")
275278
detekt("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
276279
detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:$detektVersion")
@@ -304,9 +307,7 @@ subprojects {
304307
implementation("com.okta.spring:okta-spring-boot-starter:${oktaSpringBootVersion}")
305308

306309
implementation("org.apache.commons:commons-csv:$commonsCsvVersion")
307-
implementation("com.redis.om:redis-om-spring:${redisOmSpringVersion}") {
308-
constraints { implementation("ai.djl:api:0.28.0") }
309-
}
310+
implementation("com.redis.om:redis-om-spring:${redisOmSpringVersion}")
310311
implementation("org.springframework.data:spring-data-redis")
311312
implementation("org.springframework:spring-jdbc")
312313
implementation("org.postgresql:postgresql")
@@ -616,16 +617,23 @@ val copySubProjectsDetektReportsTasks =
616617

617618
tasks.getByName("detekt") { shouldRunAfter(*copySubProjectsDetektReportsTasks.toTypedArray()) }
618619

619-
extensions.configure<kotlinx.kover.gradle.plugin.dsl.KoverReportExtension> {
620-
defaults {
621-
// reports configs for XML, HTML, verify reports
620+
extensions.configure<KoverProjectExtension>("kover") {
621+
reports {
622+
filters {
623+
excludes {
624+
projects { cosmotechApi }
625+
classes("com.cosmotech.Application*")
626+
classes("com.cosmotech.*.api.*")
627+
classes("com.cosmotech.*.domain.*")
628+
}
629+
}
622630
}
623-
filters {
624-
excludes {
625-
projects { excludes { cosmotechApi } }
626-
classes("com.cosmotech.Application*")
627-
classes("com.cosmotech.*.api.*")
628-
classes("com.cosmotech.*.domain.*")
631+
}
632+
633+
kover {
634+
reports {
635+
total {
636+
// reports configs for XML, HTML, verify reports
629637
}
630638
}
631639
}

‎connector/src/integrationTest/kotlin/com/cosmotech/connector/service/ConnectorServiceIntegrationTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import com.cosmotech.api.utils.getCurrentAuthenticatedUserName
1414
import com.cosmotech.api.utils.getCurrentAuthentication
1515
import com.cosmotech.connector.ConnectorApiServiceInterface
1616
import com.cosmotech.connector.domain.Connector
17-
import com.redis.om.spring.RediSearchIndexer
17+
import com.redis.om.spring.indexing.RediSearchIndexer
1818
import io.mockk.every
1919
import io.mockk.junit5.MockKExtension
2020
import io.mockk.mockk

‎dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import com.cosmotech.workspace.domain.WorkspaceCreateRequest
5555
import com.cosmotech.workspace.domain.WorkspaceSecurity
5656
import com.cosmotech.workspace.domain.WorkspaceSolution
5757
import com.ninjasquad.springmockk.SpykBean
58-
import com.redis.om.spring.RediSearchIndexer
58+
import com.redis.om.spring.indexing.RediSearchIndexer
5959
import com.redis.testcontainers.RedisStackContainer
6060
import io.mockk.clearAllMocks
6161
import io.mockk.every

‎dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceRBACTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import com.cosmotech.organization.domain.OrganizationAccessControl
4848
import com.cosmotech.organization.domain.OrganizationCreateRequest
4949
import com.cosmotech.organization.domain.OrganizationSecurity
5050
import com.ninjasquad.springmockk.SpykBean
51-
import com.redis.om.spring.RediSearchIndexer
51+
import com.redis.om.spring.indexing.RediSearchIndexer
5252
import com.redis.testcontainers.RedisStackContainer
5353
import io.mockk.clearAllMocks
5454
import io.mockk.every

0 commit comments

Comments
 (0)