Skip to content

Commit f0e74c5

Browse files
renovate[bot]github-actions[bot]nulls
authored
Update all non-major dependencies (except core Kotlin) (#2221)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Nariman Abdullin <nulls.narik@gmail.com>
1 parent 664b859 commit f0e74c5

29 files changed

Lines changed: 211 additions & 272 deletions

File tree

gradle/libs.versions.toml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,47 @@
22
kotlin = "1.9.10"
33
jetbrains-annotations = "24.0.1"
44
save-cli = "0.4.0-SNAPSHOT"
5-
ktor = "2.3.1"
5+
ktor = "2.3.5"
66
okio = "3.3.0"
77
serialization = "1.6.0"
88
kotlinx-datetime = "0.4.1"
99
kotlinx-coroutines = "1.7.3"
10-
kotlin-wrappers = "1.0.0-pre.566"
11-
spring-boot = "2.7.12"
12-
spring-cloud = "3.1.7"
13-
spring-cloud-kubernetes = "2.1.7"
14-
kafka-client = "3.5.0"
15-
junit = "5.9.3"
10+
kotlin-wrappers = "1.0.0-pre.634"
11+
spring-boot = "2.7.17"
12+
spring-cloud = "3.1.8"
13+
spring-cloud-kubernetes = "2.1.8"
14+
kafka-client = "3.6.0"
15+
junit = "5.10.0"
1616
assertj = "3.24.2"
1717
diktat = "1.2.5"
18-
detekt = "1.23.0"
19-
liquibase-core = "4.22.0"
20-
docker-java = "3.3.1"
21-
jgit = "6.6.0.202305301015-r"
18+
detekt = "1.23.2"
19+
liquibase-core = "4.24.0"
20+
docker-java = "3.3.4"
21+
jgit = "6.7.0.202309050840-r"
2222
mockito = "5.3.1"
2323
mockito-kotlin = "5.0.0"
2424
# only in save-cli
25-
log4j = "2.20.0"
25+
log4j = "2.21.1"
2626
jpa = "1.0.2"
2727
mySql = "8.0.33"
28-
testcontainers = "1.18.3"
28+
testcontainers = "1.19.1"
2929
okhttp3 = "4.11.0"
30-
reckon = "0.18.0"
31-
commons-compress = "1.23.0"
30+
reckon = "0.18.1"
31+
commons-compress = "1.24.0"
3232
zip4j = "2.11.5"
3333
ktoml = "0.5.0"
3434
springdoc = "1.7.0"
3535
kotlinx-cli = "0.3.6"
36-
spotless = "6.19.0"
37-
fabric8 = "6.7.1"
38-
arrow-kt = "1.1.5"
36+
spotless = "6.22.0"
37+
fabric8 = "6.9.1"
38+
arrow-kt = "1.2.1"
3939
publish = "1.3.0"
40-
download = "5.4.0"
41-
cpg = "7.0.0"
40+
download = "5.5.0"
41+
cpg = "7.1.2"
4242
# should be taken from cpg
43-
cpg-neo4j-ogm = { strictly = "4.0.4" }
44-
cpg-neo4j-java-driver = { strictly = "5.6.0" }
45-
aws-sdk = "2.20.84"
43+
cpg-neo4j-ogm = { strictly = "4.0.6" }
44+
cpg-neo4j-java-driver = { strictly = "5.7.0" }
45+
aws-sdk = "2.21.11"
4646
cosv4k = "0.0.14"
4747

4848
[plugins]
@@ -52,7 +52,7 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
5252
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
5353
kotlin-plugin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" }
5454
kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
55-
talaiot-base = { id = "io.github.cdsap.talaiot.plugin.base", version = "2.0.1" }
55+
talaiot-base = { id = "io.github.cdsap.talaiot.plugin.base", version = "2.0.3" }
5656
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
5757
spotless = { id = "com.diffplug.gradle.spotless", version.ref = "spotless" }
5858
download = { id = "de.undercouch.download", version.ref = "download" }
@@ -121,7 +121,7 @@ springdoc-openapi-ui = { module = "org.springdoc:springdoc-openapi-ui", version.
121121
springdoc-openapi-webflux-ui = { module = "org.springdoc:springdoc-openapi-webflux-ui", version.ref = "springdoc" }
122122
springdoc-openapi-security = { module = "org.springdoc:springdoc-openapi-security", version.ref = "springdoc" }
123123
springdoc-openapi-kotlin = { module = "org.springdoc:springdoc-openapi-kotlin", version.ref = "springdoc" }
124-
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.11" }
124+
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.18" }
125125

126126
ktor-client-apache = { module = "io.ktor:ktor-client-apache", version.ref = "ktor" }
127127
ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" }

renovate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"^org\\.neo4j\\:neo4j-ogm-bolt-driver",
4040
"^org\\.neo4j\\:neo4j-ogm-core"
4141
],
42-
"allowedVersions": "4.0.4",
42+
"allowedVersions": "4.0.6",
4343
"groupName": "all non-major dependencies (except core Kotlin)",
4444
"groupSlug": "all-minor-patch"
4545
},
@@ -48,7 +48,7 @@
4848
"matchPackagePatterns": [
4949
"^org\\.neo4j\\.driver\\:neo4j-java-driver"
5050
],
51-
"allowedVersions": "5.6.0",
51+
"allowedVersions": "5.7.0",
5252
"groupName": "all non-major dependencies (except core Kotlin)",
5353
"groupSlug": "all-minor-patch"
5454
},

save-backend/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id("com.saveourtool.save.buildutils.code-quality-convention")
1010
// this plugin will generate generateOpenApiDocs task
1111
// running this task, it will write the OpenAPI spec into a backend-api-docs.json file in save-backend dir.
12-
id("org.springdoc.openapi-gradle-plugin") version "1.6.0"
12+
id("org.springdoc.openapi-gradle-plugin") version "1.8.0"
1313
}
1414

1515
openApi {

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ fun main() {
8383
return
8484
}
8585

86-
kotlinext.js.require("../scss/save-frontend.scss") // this is needed for webpack to include resource
87-
kotlinext.js.require("bootstrap") // this is needed for webpack to include bootstrap
86+
kotlinext.js.require<dynamic>("../scss/save-frontend.scss") // this is needed for webpack to include resource
87+
kotlinext.js.require<dynamic>("bootstrap") // this is needed for webpack to include bootstrap
8888
ReactModal.setAppElement(document.getElementById("wrapper") as HTMLElement) // required for accessibility in react-modal
8989

9090
initI18n()

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ val requestModalHandler: FC<UserInfoAwarePropsWithChildren> = FC { props ->
128128
div {
129129
className = ClassName("d-flex justify-content-center mt-4")
130130
div {
131-
child(ringLoader)
131+
+ringLoader
132132
span {
133133
className = ClassName("sr-only")
134134
+"Loading..."

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Markdown.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import react.ChildrenBuilder
1515
* @param classes class names that should be applied to high-level div
1616
*/
1717
fun ChildrenBuilder.markdown(text: String, classes: String? = null) {
18-
child(reactMarkdown(jso {
18+
+reactMarkdown(jso {
1919
this.children = text
2020
this.className = classes
21-
}))
21+
})
2222
}

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/contests/PublicTestCardComponent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private fun ChildrenBuilder.displayTestLines(header: String, lines: List<String>
4949
this.rehypePlugins = arrayOf(::rehypeHighlightPlugin)
5050
}
5151
publicTestCard {
52-
child(reactMarkdown(reactMarkdownOptions))
52+
+reactMarkdown(reactMarkdownOptions)
5353
}
5454
}
5555

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/graph/SigmaGraphVisualizer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import web.cssom.*
1919
* Graph visualizer based on Sigma and Graphology libs
2020
*/
2121
val sigmaGraphVisualizer: FC<SigmaGraphVisualizerProps> = FC { props ->
22-
kotlinext.js.require("@react-sigma/core/lib/react-sigma.min.css")
22+
kotlinext.js.require<dynamic>("@react-sigma/core/lib/react-sigma.min.css")
2323
val (selectedNodeName, setSelectedNodeName) = useState<String?>(null)
24-
val graphology = kotlinext.js.require("graphology")
24+
val graphology: dynamic = kotlinext.js.require("graphology")
2525
sigmaContainer {
2626
settings = getSigmaContainerSettings()
2727
this.graph = graphology.MultiDirectedGraph

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,7 @@ fun <D : RowData, P : TableProps<D>> tableComponent(
262262
val column = header.column
263263
th {
264264
this.className = className
265-
child(
266-
renderHeader(header)
267-
)
265+
+renderHeader(header)
268266
if (column.getCanSort()) {
269267
style = style ?: jso()
270268
style?.cursor = "pointer".unsafeCast<Cursor>()
@@ -287,7 +285,7 @@ fun <D : RowData, P : TableProps<D>> tableComponent(
287285
tr {
288286
spread(getRowProps(row))
289287
row.getVisibleCells().map { cell ->
290-
child(renderCell(cell))
288+
+renderCell(cell)
291289
}
292290
}
293291
if (row.isExpanded) {

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/topbar/TopBarLinks.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ external interface TopBarLinksProps : Props {
8888
/**
8989
* The location is needed to change the color of the text.
9090
*/
91-
var location: Location
91+
var location: Location<*>
9292
}
9393

9494
/**
@@ -104,7 +104,7 @@ data class TopBarLink(
104104

105105
private fun textColor(
106106
hrefAnchor: String,
107-
location: Location,
107+
location: Location<*>,
108108
) = if (location.pathname.endsWith(hrefAnchor) && location.pathname.count { it == '/' } < TOP_BAR_PATH_SEGMENTS_HIGHLIGHT) {
109109
"text-warning"
110110
} else {

0 commit comments

Comments
 (0)