Skip to content
This repository was archived by the owner on Jan 19, 2025. It is now read-only.

Commit 0f58c13

Browse files
authored
Merge branch 'main' into migration-quickfixes
2 parents de2106d + efcc522 commit 0f58c13

File tree

7 files changed

+4
-103
lines changed

7 files changed

+4
-103
lines changed

.github/workflows/dependency-review.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: Dependency Review
33
on:
44
pull_request:
55
branches: [main]
6-
merge_group:
76

87
jobs:
98
dependency-review:
10-
if: ${{ github.event_name == 'pull_request' }}
119
uses: lars-reimann/.github/.github/workflows/dependency-review-reusable.yml@main

.github/workflows/megalinter.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: MegaLinter
33
on:
44
pull_request:
55
branches: [main]
6-
merge_group:
76

87
jobs:
98
megalinter:
10-
if: ${{ github.event_name == 'pull_request' }}
119
uses: lars-reimann/.github/.github/workflows/megalinter-reusable.yml@main
1210
secrets:
1311
PAT: ${{ secrets.PAT }}

.github/workflows/merge_queue.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

.github/workflows/pr-format.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ on:
77
- edited
88
- synchronize
99
- reopened
10-
merge_group:
1110

1211
jobs:
1312
check-format:
14-
if: ${{ github.event_name == 'pull_request_target' }}
1513
uses: lars-reimann/.github/.github/workflows/pr-format-reusable.yml@main

api-editor/backend/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tasks.withType<ShadowJar> {
3737
val ktorVersion = "2.2.4"
3838

3939
dependencies {
40-
implementation("ch.qos.logback:logback-classic:1.4.5")
40+
implementation("ch.qos.logback:logback-classic:1.4.6")
4141
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
4242
implementation("io.ktor:ktor-server:$ktorVersion")
4343
implementation("io.ktor:ktor-server-netty:$ktorVersion")

api-editor/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
id("org.jetbrains.kotlinx.kover") version "0.6.1"
66

77
// Pin versions for subprojects
8-
kotlin("jvm") version "1.8.0" apply false
8+
kotlin("jvm") version "1.8.10" apply false
99
kotlin("plugin.serialization") version "1.8.10" apply false
1010
id("com.github.johnrengelman.shadow") version "8.1.0" apply false
1111
id("com.github.node-gradle.node") version "3.5.1" apply false
12-
id("org.jetbrains.compose") version "1.3.0" apply false
12+
id("org.jetbrains.compose") version "1.3.1" apply false
1313
}
1414

1515
repositories {

api-editor/desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ compose.desktop {
3737

3838
dependencies {
3939
implementation(compose.desktop.currentOs)
40-
implementation("org.jetbrains.compose.components:components-splitpane:1.3.0")
40+
implementation("org.jetbrains.compose.components:components-splitpane:1.3.1")
4141

4242
testImplementation(kotlin("test"))
4343
testImplementation("io.kotest:kotest-assertions-core-jvm:5.5.5")

0 commit comments

Comments
 (0)