Skip to content

Commit 973c674

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # settings.gradle.kts
2 parents aafa196 + a92cc4c commit 973c674

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168

169169
# Run Qodana inspections
170170
- name: Qodana - Code Inspection
171-
uses: JetBrains/qodana-action@v2025.1.0
171+
uses: JetBrains/qodana-action@v2025.1.1
172172
with:
173173
cache-default-branch-only: true
174174

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ junit = "4.13.2"
44

55
# plugins
66
changelog = "2.2.1"
7-
kotlin = "2.1.20"
8-
intelliJPlatform = "2.5.0"
7+
kotlin = "2.1.21"
8+
intelliJPlatform = "2.6.0"
99
kover = "0.9.1"
10-
qodana = "2025.1.0"
11-
ktorVersion = "3.1.2"
10+
qodana = "2025.1.1"
11+
ktorVersion = "3.1.3"
1212
kotlinxSerialization = "1.8.1"
1313
freeMarker = "2.3.34"
1414

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pluginManagement {
22
plugins {
33
id("org.jetbrains.compose").version(extra["compose.version"] as String)
4-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
4+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
55
}
66
}
77

0 commit comments

Comments
 (0)