Skip to content

Commit

Permalink
Merge branch 'TeamHarTex:nightly' into nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
HTGAzureX1212 authored Aug 13, 2023
2 parents 4c373de + 5b53f10 commit cd67261
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions bors/Cargo.lock

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

2 changes: 1 addition & 1 deletion bors/hartex-bors-commands/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ hartex_log = { path = "../../rust-utilities/hartex-log" }

itertools = "0.11.0"
miette = "5.10.0"
tokio = { version = "1.30.0", features = ["time"] }
tokio = { version = "1.31.0", features = ["time"] }

[features]
2 changes: 1 addition & 1 deletion bors/hartex-bors-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ rust-version = "1.73.0"
miette = "5.10.0"
octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" }
sea-orm = { version = "0.12.2", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] }
tokio = { version = "1.30.0", features = ["sync"] }
tokio = { version = "1.31.0", features = ["sync"] }

[features]
2 changes: 1 addition & 1 deletion bors/hartex-bors-driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" }
reqwest-eventsource = { git = "https://github.com/TeamHarTex/reqwest-eventsource.git" }
serde_json = "1.0.104"
state = "0.6.0"
tokio = { version = "1.30.0", features = ["rt-multi-thread", "sync"] }
tokio = { version = "1.31.0", features = ["rt-multi-thread", "sync"] }

[features]
2 changes: 1 addition & 1 deletion bors/hartex-bors-github/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" }
secrecy = "0.8.0"
serde = { version = "1.0.183", features = ["derive"] }
serde_json = "1.0.104"
tokio = { version = "1.30.0", features = ["sync"] }
tokio = { version = "1.31.0", features = ["sync"] }

[features]
2 changes: 1 addition & 1 deletion bors/hartex-bors-permissions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ hartex_log = { path = "../../rust-utilities/hartex-log" }
hyper = { version = "0.14.27", features = ["client", "http2"] }
miette = "5.10.0"
serde_json = "1.0.104"
tokio = { version = "1.30.0", features = ["sync"] }
tokio = { version = "1.31.0", features = ["sync"] }

[features]
8 changes: 4 additions & 4 deletions discord-frontend/Cargo.lock

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

2 changes: 1 addition & 1 deletion discord-frontend/hartex-discord-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dotenvy = { version = "0.15.7", optional = true }
num_enum = "0.6.1"
num_enum_derive = "0.6.1"
socket2 = { git = "https://github.com/rust-lang/socket2.git", branch = "v0.4.x" }
tokio = { version = "1.30.0", optional = true }
tokio = { version = "1.31.0", optional = true }
twilight-gateway = { git = "https://github.com/TeamHarTex/twilight.git", branch = "next", optional = true }
twilight-http = { git = "https://github.com/TeamHarTex/twilight.git", branch = "next", optional = true }
twilight-mention = { git = "https://github.com/TeamHarTex/twilight.git", branch = "next", optional = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rust-version = "1.73.0"
hartex_discord_core = { path = "../hartex-discord-core", features = ["discord-model"] }
hartex_discord_entitycache_macros = { path = "../hartex-discord-entitycache-macros", optional = true }

redis = { version = "0.23.1", features = ["tokio-comp"] }
redis = { version = "0.23.2", features = ["tokio-comp"] }

[features]
derive = ["dep:hartex_discord_entitycache_macros"]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hartex_discord_core = { path = "../hartex-discord-core", features = ["discord-mo
hartex_discord_entitycache_core = { path = "../hartex-discord-entitycache-core" }
hartex_discord_entitycache_entities = { path = "../hartex-discord-entitycache-entities" }

redis = { version = "0.23.1", features = ["tokio-comp"] }
redis = { version = "0.23.2", features = ["tokio-comp"] }
serde_scan = "0.4.1"

[features]

0 comments on commit cd67261

Please sign in to comment.