Skip to content

Commit

Permalink
Replaced patch versions with releases
Browse files Browse the repository at this point in the history
  • Loading branch information
nikarh committed Oct 23, 2023
1 parent e10b47a commit dfe2140
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 17 deletions.
29 changes: 18 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ lto = true
opt-level = 2

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

socket2053 = { git = "https://github.com/rust-lang/socket2", branch = "master", package = "socket2", version = "0.5.3" }
socket2049 = { git = "https://github.com/rust-lang/socket2", branch = "v0.4.x", package = "socket2", version = "0.4.9" }

# Required for rustls
ring = { git = "https://github.com/vita-rust/ring", branch = "v0.16.20-vita" }
13 changes: 11 additions & 2 deletions crates/2-http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@ rustls = ["reqwest/rustls-tls", "oxhttp/rustls"]
openssl = ["reqwest/native-tls"]

[dependencies]
anyhow = "1.0"
# No need for shims with latest VITASDK
vita-newlib-shims = { version = "0.3" }

# Force cargo to use at least these versions of transitive dependencies.
# You can either do `cargo update`, or specify them here.
libc = "0.2.149"
mio = "0.8.9"
socket2 = "0.5.5"
socket24 = { version = "0.4.10", package = "socket2"}

# Actual dependencies
anyhow = "1.0"
reqwest = { version = "0.11", default-features = false, features = ["json"] }
tokio = { version = "1", features = ["macros", "rt", "net"] }
oxhttp = { version = "0.2.0-alpha.1", features = ["rustls", "webpki-roots"] }
ureq = { version = "2.7.1", default-features = false, features = ["gzip"] }
vita-newlib-shims = { version = "0.3" }

[package.metadata.vita]
title_id = "RUSTTEST2"
Expand Down
2 changes: 2 additions & 0 deletions crates/3-sdl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ homepage = "https://github.com/vita-rust/examples/crates/3-sdl"
description = "An adapted Sdl2 game of life example (https://github.com/Rust-SDL2/rust-sdl2/blob/master/examples/game-of-life.rs)"

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

[package.metadata.vita]
Expand Down

0 comments on commit dfe2140

Please sign in to comment.