Skip to content

Commit 7034ec9

Browse files
authored
Merge branch 'main' into dependabot/cargo/objc2-0.6
2 parents c3a5c26 + fad067f commit 7034ec9

4 files changed

Lines changed: 114 additions & 111 deletions

File tree

.github/workflows/checks.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ jobs:
88
name: cargo-fmt
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: dtolnay/rust-toolchain@stable
1313
- run: cargo fmt --all -- --check
1414

1515
prettier:
1616
name: prettier
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: actions/setup-node@v4
19+
- uses: actions/checkout@v5
20+
- uses: pnpm/action-setup@v4
21+
with:
22+
run_install: false
23+
- uses: actions/setup-node@v5
2124
with:
2225
node-version: "20"
23-
- run: npm install -g pnpm
26+
cache: "pnpm"
2427
- run: pnpm install
2528
- run: pnpm run format-check
2629

@@ -34,7 +37,7 @@ jobs:
3437
packages: libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf llvm-dev clang cmake grcov
3538
version: "1.0" # bump this to invalidate the cache when needed
3639

37-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
3841
- uses: dtolnay/rust-toolchain@stable
3942
- run: cargo clippy --all-targets --all-features -- -D warnings
4043

@@ -48,7 +51,7 @@ jobs:
4851
packages: libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf llvm-dev clang cmake grcov
4952
version: "1.0" # bump this to invalidate the cache when needed
5053

51-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5255
- uses: dtolnay/rust-toolchain@stable
5356
- run: cargo install cargo-deadlinks
5457
- run: cargo doc --no-deps -p tauri-plugin-biometry
@@ -59,14 +62,14 @@ jobs:
5962
name: mlc
6063
runs-on: ubuntu-latest
6164
steps:
62-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6366
- uses: becheran/mlc@v1
6467

6568
# Spellcheck.
6669
spellcheck:
6770
runs-on: ubuntu-latest
6871
steps:
69-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v5
7073
- uses: streetsidesoftware/cspell-action@v7
7174
with:
7275
files: "**/*.{rs,md}"
@@ -76,7 +79,7 @@ jobs:
7679
name: cargo-deny
7780
runs-on: ubuntu-latest
7881
steps:
79-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v5
8083
- uses: EmbarkStudios/cargo-deny-action@v2
8184

8285
# cargo-semver.
@@ -89,7 +92,7 @@ jobs:
8992
packages: libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf llvm-dev clang cmake grcov
9093
version: "1.0" # bump this to invalidate the cache when needed
9194

92-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9396
- uses: obi1kenobi/cargo-semver-checks-action@v2
9497

9598

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
needs: publish-crate
2323
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
fetch-depth: 0
2828

2929
# Node + registry auth
30-
- uses: actions/setup-node@v4
30+
- uses: actions/setup-node@v5
3131
with:
3232
node-version: "20"
3333
registry-url: "https://registry.npmjs.org"
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ubuntu-latest
6060
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v5
6363
with:
6464
fetch-depth: 0
6565

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ log = "0.4"
2020

2121
[target.'cfg(target_os = "macos")'.dependencies]
2222
objc2 = "0.6"
23-
objc2-foundation = "0.2"
24-
objc2-local-authentication = { version = "0.2", features = ["LAContext", "LAError", "block2"] }
25-
objc2-security = "0.3"
2623
objc2-core-foundation = "0.3"
27-
block2 = "0.5"
24+
objc2-foundation = { version = "0.3", features = ["NSString"] }
25+
objc2-local-authentication = { version = "0.3", features = ["LAContext", "LAError", "block2"] }
26+
objc2-security = "0.3"
27+
block2 = "0.6"
2828

2929
[target.'cfg(target_os = "windows")'.dependencies]
3030
windows = { version = "0.58", features = ["Foundation", "Storage_Streams", "Security_Credentials_UI", "Security_Cryptography_Core", "Win32_Foundation", "Win32_UI_WindowsAndMessaging"] }

0 commit comments

Comments
 (0)