Skip to content

Commit 459be48

Browse files
lonerapierlonerapier
authored
chore: upgrade (#1)
* update cdp to r1465725 * increase browser default viewport * update deps * clippy fixes * doc changes * remove MSRV check from CI workflow
1 parent 6f2392f commit 459be48

File tree

27 files changed

+117751
-1314
lines changed

27 files changed

+117751
-1314
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 101 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,128 @@
1-
on: [push, pull_request]
1+
name: CI
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25

3-
name: Continuous integration
6+
on:
7+
push:
8+
branches: [main]
9+
pull_request:
10+
branches: [main]
11+
12+
env:
13+
CARGO_TERM_COLOR: always
414

515
jobs:
616
check:
7-
name: Check
17+
name: check
818
runs-on: ubuntu-latest
919
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions-rs/toolchain@v1
12-
with:
13-
profile: minimal
14-
toolchain: stable
15-
override: true
16-
- uses: actions-rs/cargo@v1
20+
- uses: actions/checkout@v4
21+
22+
- name: Install Rust
23+
uses: dtolnay/rust-toolchain@stable
24+
25+
- name: Rust Cache
26+
uses: Swatinem/rust-cache@v2
1727
with:
18-
command: check
28+
key: rust/check
29+
30+
- name: Run cargo check
31+
run: cargo check --workspace
1932

2033
test:
21-
name: Test Suite
22-
strategy:
23-
matrix:
24-
os: [ubuntu-latest, macos-latest, windows-latest]
25-
runs-on: ${{ matrix.os }}
34+
name: test
35+
runs-on: ubuntu-latest
2636
steps:
27-
- uses: actions/checkout@v2
28-
- uses: actions-rs/toolchain@v1
29-
with:
30-
profile: minimal
31-
toolchain: stable
32-
override: true
33-
- uses: actions-rs/cargo@v1
37+
- uses: actions/checkout@v4
38+
39+
- name: Install Rust
40+
uses: dtolnay/rust-toolchain@stable
41+
42+
- name: Rust Cache
43+
uses: Swatinem/rust-cache@v2
3444
with:
35-
command: test
45+
key: rust/test
3646

37-
fmt:
38-
name: Rustfmt
47+
- name: Run tests
48+
run: cargo test --verbose --workspace
49+
50+
rust-fmt:
51+
name: rustfmt
3952
runs-on: ubuntu-latest
4053
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions-rs/toolchain@v1
54+
- uses: actions/checkout@v4
55+
56+
- name: Install Rust
57+
uses: dtolnay/rust-toolchain@stable
4358
with:
44-
profile: minimal
45-
toolchain: stable
46-
override: true
47-
- run: rustup component add rustfmt
48-
- uses: actions-rs/cargo@v1
59+
components: rustfmt
60+
61+
- name: Rust Cache
62+
uses: Swatinem/rust-cache@v2
4963
with:
50-
command: fmt
51-
args: --all -- --check
64+
key: rust/rustfmt
65+
66+
- name: Run Rust fmt
67+
run: cargo fmt --all -- --check
5268

5369
clippy:
54-
name: Clippy
70+
name: clippy
5571
runs-on: ubuntu-latest
5672
steps:
57-
- uses: actions/checkout@v2
58-
- uses: actions-rs/toolchain@v1
73+
- uses: actions/checkout@v4
74+
75+
- name: Install Rust
76+
uses: dtolnay/rust-toolchain@stable
5977
with:
60-
profile: minimal
61-
toolchain: stable
62-
override: true
63-
- run: rustup component add clippy
64-
- uses: actions-rs/cargo@v1
78+
components: clippy
79+
80+
- name: Rust Cache
81+
uses: Swatinem/rust-cache@v2
82+
with:
83+
key: rust/clippy
84+
85+
- name: Build
86+
run: cargo build --workspace
87+
88+
- name: Clippy
89+
run: cargo clippy --all-targets --all-features -- --deny warnings
90+
91+
doc:
92+
name: doc
93+
runs-on: ubuntu-latest
94+
steps:
95+
- uses: actions/checkout@v4
96+
97+
- name: Install Rust
98+
uses: dtolnay/rust-toolchain@stable
99+
100+
- name: Rust Cache
101+
uses: Swatinem/rust-cache@v2
65102
with:
66-
command: clippy
67-
args: -- -D warnings
103+
key: rust/doc
68104

69-
msrv:
105+
- name: Run cargo doc to check for warnings
106+
run: RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --all-features
107+
108+
toml-fmt:
109+
name: taplo
70110
runs-on: ubuntu-latest
71111
steps:
72-
- uses: actions/checkout@v2
73-
- uses: actions-rs/toolchain@v1
112+
- uses: actions/checkout@v4
113+
114+
- name: Install Rust
115+
uses: dtolnay/rust-toolchain@stable
116+
117+
- name: Install taplo
118+
uses: taiki-e/install-action@cargo-binstall
74119
with:
75-
profile: minimal
76-
toolchain: "1.70.0"
77-
override: true
78-
- uses: actions-rs/cargo@v1
120+
tool: taplo-cli
121+
122+
- name: Rust Cache
123+
uses: Swatinem/rust-cache@v2
79124
with:
80-
command: check
81-
args: --lib
125+
key: rust/taplo
126+
127+
- name: Run TOML fmt
128+
run: taplo fmt --check

‎Cargo.toml‎

Lines changed: 88 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "chromiumoxide"
33
version = "0.7.0"
4-
rust-version = "1.70"
4+
rust-version = "1.87"
55
authors = ["Matthias Seitz <matthias.seitz@outlook.de>"]
66
edition = "2021"
77
license = "MIT OR Apache-2.0"
@@ -13,47 +13,48 @@ keywords = ["chrome", "chromedriver", "puppeteer", "automation"]
1313
categories = ["web-programming", "api-bindings", "development-tools::testing"]
1414

1515
[dependencies]
16-
async-tungstenite = "0.28.0"
17-
serde = { version = "1", features = ["derive"] }
18-
async-std = { version = "1", features = [
19-
"attributes",
20-
"unstable",
16+
async-tungstenite = "0.29.1"
17+
serde = { version = "1.0.197", features = ["derive"] }
18+
async-std = { version = "1.12.0", features = [
19+
"attributes",
20+
"unstable",
2121
], optional = true }
22-
futures = "0.3"
22+
futures = "0.3.31"
2323
chromiumoxide_types = { path = "chromiumoxide_types", version = "0.7" }
2424
chromiumoxide_cdp = { path = "chromiumoxide_cdp", version = "0.7" }
2525
chromiumoxide_fetcher = { path = "chromiumoxide_fetcher", version = "0.7", default-features = false, optional = true }
26-
serde_json = "1"
27-
which = "6"
28-
thiserror = "1"
29-
url = "2"
30-
base64 = "0.22"
31-
fnv = "1"
32-
futures-timer = "3"
33-
cfg-if = "1"
34-
tokio = { version = "1", features = [
35-
"rt",
36-
"rt-multi-thread",
37-
"time",
38-
"fs",
39-
"macros",
40-
"process",
26+
serde_json = "1.0.114"
27+
which = "8.0.0"
28+
thiserror = "2.0.12"
29+
url = "2.5.4"
30+
base64 = "0.22.1"
31+
fnv = "1.0.7"
32+
futures-timer = "3.0.3"
33+
cfg-if = "1.0.1"
34+
tokio = { version = "1.37.0", features = [
35+
"rt",
36+
"rt-multi-thread",
37+
"time",
38+
"fs",
39+
"macros",
40+
"process",
4141
], optional = true }
42-
tracing = "0.1"
43-
pin-project-lite = "0.2"
44-
dunce = "1"
45-
bytes = { version = "1", features = ["serde"], optional = true }
46-
reqwest = { version = "0.12", default-features = false }
42+
tracing = "0.1.40"
43+
pin-project-lite = "0.2.13"
44+
dunce = "1.0.5"
45+
bytes = { version = "1.5.0", features = ["serde"], optional = true }
46+
reqwest = { version = "0.12.20", default-features = false }
4747

4848
[target.'cfg(windows)'.dependencies]
49-
winreg = "0.52"
49+
winreg = "0.55.0"
5050

5151
[dev-dependencies]
52-
quote = "1"
53-
proc-macro2 = "1"
54-
chrono = "0.4.1"
55-
tracing-subscriber = "0.3"
56-
tokio = { version = "1", features = ["rt-multi-thread", "time", "macros"] }
52+
quote = "1.0.40"
53+
proc-macro2 = "1.0.95"
54+
chrono = "0.4.38"
55+
tracing-subscriber = "0.3.18"
56+
tokio = { version = "1.37.0", features = ["rt-multi-thread", "time", "macros"] }
57+
ureq = "3.0.12"
5758

5859
[features]
5960
default = ["async-std-runtime", "bytes"]
@@ -65,9 +66,15 @@ serde0 = []
6566

6667
# Temporary features until cargo weak dependencies bug is fixed
6768
# See https://github.com/rust-lang/cargo/issues/10801
68-
_fetcher-rustls-async-std = ["fetcher", "chromiumoxide_fetcher/_rustls-async-std"]
69+
_fetcher-rustls-async-std = [
70+
"fetcher",
71+
"chromiumoxide_fetcher/_rustls-async-std",
72+
]
6973
_fetcher-rusttls-tokio = ["fetcher", "chromiumoxide_fetcher/_rustls-tokio"]
70-
_fetcher-native-async-std = ["fetcher", "chromiumoxide_fetcher/_native-async-std"]
74+
_fetcher-native-async-std = [
75+
"fetcher",
76+
"chromiumoxide_fetcher/_native-async-std",
77+
]
7178
_fetcher-native-tokio = ["fetcher", "chromiumoxide_fetcher/_native-tokio"]
7279

7380
[[example]]
@@ -100,8 +107,50 @@ required-features = ["tokio-runtime", "_fetcher-native-tokio"]
100107

101108
[workspace]
102109
members = [
103-
"chromiumoxide_pdl",
104-
"chromiumoxide_types",
105-
"chromiumoxide_cdp",
106-
"chromiumoxide_fetcher",
110+
"chromiumoxide_pdl",
111+
"chromiumoxide_types",
112+
"chromiumoxide_cdp",
113+
"chromiumoxide_fetcher",
107114
]
115+
116+
[workspace.dependencies]
117+
# Core dependencies
118+
serde = { version = "1.0.197", features = ["derive"] }
119+
serde_json = "1.0.114"
120+
thiserror = "2.0.12"
121+
anyhow = "1.0.86"
122+
either = "1.15.0"
123+
124+
# Async runtime dependencies
125+
async-std = { version = "1.12.0", features = ["attributes", "unstable"] }
126+
tokio = { version = "1.37.0", features = [
127+
"rt",
128+
"rt-multi-thread",
129+
"time",
130+
"fs",
131+
"macros",
132+
"process",
133+
] }
134+
futures = "0.3.31"
135+
136+
# Web and networking
137+
reqwest = { version = "0.12.20", default-features = false }
138+
surf = { version = "2.3.2", default-features = false }
139+
ureq = "3.0.12"
140+
141+
# File and system utilities
142+
directories = "6.0.0"
143+
os_info = { version = "3.12.0", default-features = false }
144+
zip = { version = "4.2.0", default-features = false, features = ["deflate"] }
145+
tempfile = "3.20.0"
146+
147+
# Parsing and code generation
148+
regex = "1.11.1"
149+
quote = "1.0.40"
150+
proc-macro2 = "1.0.95"
151+
heck = "0.5.0"
152+
once_cell = "1.21.3"
153+
154+
# Development dependencies
155+
chrono = "0.4.38"
156+
tracing-subscriber = "0.3.18"

‎chromiumoxide_cdp/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "chromiumoxide_cdp"
33
version = "0.7.0"
44
authors = ["Matthias Seitz <matthias.seitz@outlook.de>"]
55
edition = "2021"
6-
rust-version = "1.70"
6+
rust-version = "1.87"
77
description = "Contains all the generated types for chromiumoxide"
88
license = "MIT OR Apache-2.0"
99
homepage = "https://github.com/mattsse/chromiumoxide"
@@ -16,11 +16,11 @@ serde0 = []
1616

1717
[dev-dependencies]
1818
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.7" }
19-
ureq = "2.10.0"
20-
tempfile = "3.10.1"
19+
ureq = { workspace = true }
20+
tempfile = { workspace = true }
2121

2222
[dependencies]
2323
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.7" }
2424
chromiumoxide_types = { path = "../chromiumoxide_types", version = "0.7" }
25-
serde = { version = "1", features = ["derive"] }
26-
serde_json = "1"
25+
serde = { workspace = true, features = ["derive"] }
26+
serde_json = { workspace = true }

0 commit comments

Comments
 (0)