Skip to content

Commit 46cb0f4

Browse files
authored
build/qg-xxx: обновлены минорные зависимости проекта (#281)
2 parents dd753cd + 214c8b8 commit 46cb0f4

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

app/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,4 +225,8 @@ kover {
225225
}
226226
}
227227
}
228+
}
229+
230+
gitProperties {
231+
dotGitDirectory = file("${project.rootDir}/.git")
228232
}

e2e-tests/build.gradle.kts

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
55
alias(libs.plugins.kotlin)
6-
alias(libs.plugins.spring.dependencyManagement)
7-
// см. https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#managing-dependencies.dependency-management-plugin.using-in-isolation
8-
alias(libs.plugins.spring.boot) apply false
9-
}
10-
11-
the<DependencyManagementExtension>().apply {
12-
imports {
13-
mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)
14-
}
156
}
167

178
group = "pro.qyoga.e2e-tests"
@@ -28,6 +19,8 @@ repositories {
2819
}
2920

3021
dependencies {
22+
implementation(platform("org.springframework.boot:spring-boot-dependencies:${libs.versions.springBoot.get()}"))
23+
3124
testImplementation(kotlin("reflect"))
3225
testImplementation(project(":app"))
3326
testImplementation(testFixtures(project(":app")))
@@ -37,9 +30,11 @@ dependencies {
3730
}
3831

3932
tasks.withType<KotlinCompile> {
40-
kotlinOptions {
41-
freeCompilerArgs = listOf("-Xjsr305=strict", "-Xjvm-default=all")
42-
jvmTarget = "21"
33+
kotlin {
34+
compilerOptions {
35+
freeCompilerArgs = listOf("-Xjsr305=strict", "-Xjvm-default=all")
36+
jvmTarget.set(JvmTarget.JVM_21)
37+
}
4338
}
4439
}
4540

settings.gradle.kts

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ dependencyResolutionManagement {
66
versionCatalogs {
77
create("libs") {
88
// plugin versions
9-
val kotlinVersion = version("kotlin", "2.1.0")
10-
val springBootVersion = version("springBoot", "3.4.0")
11-
val springDependencyManagementVersion = version("springDependencyManagement", "1.1.6")
12-
val koverVersion = version("kover", "0.8.3")
13-
val gitPropertiesVersion = version("gitProperties", "2.4.2")
9+
val kotlinVersion = version("kotlin", "2.1.21")
10+
val springBootVersion = version("springBoot", "3.5.0")
11+
val springDependencyManagementVersion = version("springDependencyManagement", "1.1.7")
12+
val koverVersion = version("kover", "0.9.1")
13+
val gitPropertiesVersion = version("gitProperties", "2.5.0")
1414

1515
// lib versions
16-
val poiVersion = version("poi", "5.3.0")
16+
val poiVersion = version("poi", "5.4.1")
1717

1818
// plugins
1919
plugin("kotlin", "org.jetbrains.kotlin.jvm").versionRef(kotlinVersion)
@@ -28,15 +28,15 @@ dependencyResolutionManagement {
2828
plugin("gitProperties", "com.gorylenko.gradle-git-properties").versionRef(gitPropertiesVersion)
2929

3030
// libs
31-
library("jackarta-validation", "jakarta.validation", "jakarta.validation-api").version("3.1.0")
31+
library("jackarta-validation", "jakarta.validation", "jakarta.validation-api").version("3.1.1")
3232
library(
3333
"thymeleaf-extras-java8time",
3434
"org.thymeleaf.extras",
3535
"thymeleaf-extras-java8time"
3636
).version("3.0.4.RELEASE")
3737

38-
library("postgres", "org.postgresql", "postgresql").version("42.7.4")
39-
library("minio", "io.minio", "minio").version("8.5.14")
38+
library("postgres", "org.postgresql", "postgresql").version("42.7.6")
39+
library("minio", "io.minio", "minio").version("8.5.17")
4040

4141
library("poi-ooxml", "org.apache.poi", "poi-ooxml").versionRef(poiVersion)
4242
library("poi-ooxml-lite", "org.apache.poi", "poi-ooxml-lite").versionRef(poiVersion)
@@ -48,10 +48,11 @@ dependencyResolutionManagement {
4848
}
4949

5050
create("testLibs") {
51-
val selenideVersion = version("selenide", "7.6.1")
52-
val testContainersVersion = version("testcontainers", "1.20.4")
53-
val restAssuredVersion = version("restAssured", "5.5.0")
51+
val selenideVersion = version("selenide", "7.9.3")
52+
val testContainersVersion = version("testcontainers", "1.21.1")
53+
val restAssuredVersion = version("restAssured", "5.5.5")
5454
val kotestVersion = version("kotest", "5.9.1")
55+
val wiremockVersion = version("wiremock", "3.13.0")
5556

5657
library("selenide-proxy", "com.codeborne", "selenide-proxy").versionRef(selenideVersion)
5758
library("testcontainers-selenium", "org.testcontainers", "selenium").versionRef(testContainersVersion)
@@ -69,18 +70,18 @@ dependencyResolutionManagement {
6970
).versionRef(restAssuredVersion)
7071
bundle("restassured", listOf("restassured-core", "restassured-kotlin", "restassured-json-schema"))
7172

72-
library("jsoup", "org.jsoup", "jsoup").version("1.18.1")
73-
library("datafaker", "net.datafaker", "datafaker").version("2.4.2")
74-
library("greenmail", "com.icegreen", "greenmail-junit5").version("2.1.2")
73+
library("jsoup", "org.jsoup", "jsoup").version("1.20.1")
74+
library("datafaker", "net.datafaker", "datafaker").version("2.4.3")
75+
library("greenmail", "com.icegreen", "greenmail-junit5").version("2.1.3")
7576

7677
library("testcontainers-minio", "org.testcontainers", "minio").versionRef(testContainersVersion)
7778

7879
library("mockito-kotlin", "org.mockito.kotlin", "mockito-kotlin").version("5.4.0")
79-
library("archunit", "com.tngtech.archunit", "archunit").version("1.3.0")
80-
library("instancio", "org.instancio", "instancio-junit").version("5.4.0")
80+
library("archunit", "com.tngtech.archunit", "archunit").version("1.4.1")
81+
library("instancio", "org.instancio", "instancio-junit").version("5.4.1")
8182

82-
library("wiremock", "org.wiremock", "wiremock").version("3.12.1")
83-
library("wiremock-jetty12", "org.wiremock", "wiremock-jetty12").version("3.12.1")
83+
library("wiremock", "org.wiremock", "wiremock").versionRef(wiremockVersion)
84+
library("wiremock-jetty12", "org.wiremock", "wiremock-jetty12").versionRef(wiremockVersion)
8485
library("wiremock-kotlin", "com.marcinziolo", "kotlin-wiremock").version("2.1.1")
8586
}
8687
}

0 commit comments

Comments
 (0)