Skip to content

Commit dfe2140

Browse files
committed
Replaced patch versions with releases
1 parent e10b47a commit dfe2140

File tree

4 files changed

+31
-17
lines changed

4 files changed

+31
-17
lines changed

Cargo.lock

Lines changed: 18 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ lto = true
88
opt-level = 2
99

1010
[patch.crates-io]
11-
mio = { git = "https://github.com/vita-rust/mio", branch = "vita" }
1211
tokio = { git = "https://github.com/vita-rust/tokio", branch = "vita" }
1312

14-
socket2053 = { git = "https://github.com/rust-lang/socket2", branch = "master", package = "socket2", version = "0.5.3" }
15-
socket2049 = { git = "https://github.com/rust-lang/socket2", branch = "v0.4.x", package = "socket2", version = "0.4.9" }
16-
1713
# Required for rustls
1814
ring = { git = "https://github.com/vita-rust/ring", branch = "v0.16.20-vita" }

crates/2-http-client/Cargo.toml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,22 @@ rustls = ["reqwest/rustls-tls", "oxhttp/rustls"]
1313
openssl = ["reqwest/native-tls"]
1414

1515
[dependencies]
16-
anyhow = "1.0"
16+
# No need for shims with latest VITASDK
17+
vita-newlib-shims = { version = "0.3" }
18+
19+
# Force cargo to use at least these versions of transitive dependencies.
20+
# You can either do `cargo update`, or specify them here.
1721
libc = "0.2.149"
22+
mio = "0.8.9"
23+
socket2 = "0.5.5"
24+
socket24 = { version = "0.4.10", package = "socket2"}
25+
26+
# Actual dependencies
27+
anyhow = "1.0"
1828
reqwest = { version = "0.11", default-features = false, features = ["json"] }
1929
tokio = { version = "1", features = ["macros", "rt", "net"] }
2030
oxhttp = { version = "0.2.0-alpha.1", features = ["rustls", "webpki-roots"] }
2131
ureq = { version = "2.7.1", default-features = false, features = ["gzip"] }
22-
vita-newlib-shims = { version = "0.3" }
2332

2433
[package.metadata.vita]
2534
title_id = "RUSTTEST2"

crates/3-sdl/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ homepage = "https://github.com/vita-rust/examples/crates/3-sdl"
1010
description = "An adapted Sdl2 game of life example (https://github.com/Rust-SDL2/rust-sdl2/blob/master/examples/game-of-life.rs)"
1111

1212
[dependencies]
13+
# Using pkgconfig is necessary for correct linking for all native dependencies.
14+
# sdl2 uses "use-pkgconfig" feature for that.
1315
sdl2 = { version = "0.35.2", features = ["use-pkgconfig"] }
1416

1517
[package.metadata.vita]

0 commit comments

Comments
 (0)