Skip to content

Commit b3f24d0

Browse files
committed
Merge remote-tracking branch 'refs/remotes/ellan/dev' into codex/pr52-resolve-20260705235913
# Conflicts: # build.gradle.kts
2 parents f60f2c7 + 7ce4551 commit b3f24d0

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
uses: actions/checkout@v7
7878

7979
- name: Cache native build (CMake)
80-
uses: actions/cache@v5
80+
uses: actions/cache@v6
8181
with:
8282
path: |
8383
build/native/gbmahjong

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: chmod +x ./gradlew
6767

6868
- name: Cache native build (CMake)
69-
uses: actions/cache@v5
69+
uses: actions/cache@v6
7070
with:
7171
path: |
7272
build/native/gbmahjong

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
kotlin("plugin.serialization") version "2.4.0"
99
id("io.papermc.paperweight.userdev") version "2.0.0-SNAPSHOT"
1010
id("com.diffplug.spotless") version "8.8.0"
11-
id("dev.detekt") version "2.0.0-alpha.4"
11+
id("dev.detekt") version "2.0.0-alpha.5"
1212
}
1313

1414
group = "top.ellan"

0 commit comments

Comments
 (0)