Skip to content

Commit 2d9a785

Browse files
committed
Merge branch 'renovate/all-minor-patch'
2 parents 0d07fa8 + 0d29f8d commit 2d9a785

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
22
kotlin = "1.9.22"
3-
kotlinx = "1.9.0"
3+
kotlinx = "1.10.1"
44
kotest = "5.9.1"
55
detekt = "1.23.7"
66
junit = "5.11.4"
7-
koin = "4.0.0"
8-
quarkus = "3.17.5"
7+
koin = "4.0.1"
8+
quarkus = "3.17.7"
99
jakarta = "4.1.0"
1010
spring-boot-2x = "2.7.18"
1111
spring-boot-3x = "3.4.1"
@@ -37,7 +37,7 @@ quarkus-junit5 = { module = "io.quarkus:quarkus-junit5", version.ref = "quarkus"
3737
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
3838

3939
[plugins]
40-
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.9.0" }
40+
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.9.1" }
4141
testLogger = { id = "com.adarshr.test-logger", version = "4.0.0" }
4242
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
4343
spotless = { id = "com.diffplug.spotless", version = "7.0.2" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

projects/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ subprojects {
1313
kotlin {
1414
jvmToolchain(17)
1515
compilerOptions {
16-
freeCompilerArgs = listOf("-Xjsr305=strict")
16+
freeCompilerArgs = listOf("-Xjsr305=strict", "-Xskip-metadata-version-check")
1717
allWarningsAsErrors = true
1818
}
1919
}

settings.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include(
1515
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
1616

1717
plugins {
18-
id("dev.aga.gradle.version-catalog-generator") version ("3.0.0")
18+
id("dev.aga.gradle.version-catalog-generator") version ("3.2.0")
1919
}
2020

2121
dependencyResolutionManagement {
@@ -32,8 +32,10 @@ dependencyResolutionManagement {
3232

3333
versionCatalogs {
3434
generate("junitLibs") {
35-
from(toml("junitBom"))
36-
aliasPrefixGenerator = GeneratorConfig.NO_PREFIX
35+
fromToml("junitBom")
36+
using {
37+
aliasPrefixGenerator = GeneratorConfig.NO_PREFIX
38+
}
3739
}
3840
}
3941
}

0 commit comments

Comments
 (0)