Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: switch all workspace deps to use *.workspace = true #1401

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

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

32 changes: 32 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,17 @@ path = "packages/common/connection"
[workspace.dependencies.rivet-util]
path = "packages/common/util/core"

[workspace.dependencies.util]
package = "rivet-util"
path = "packages/common/util/core"

[workspace.dependencies.rivet-util-search]
path = "packages/common/util/search"

[workspace.dependencies.util-search]
package = "rivet-util-search"
path = "packages/common/util/search"

[workspace.dependencies.rivet-util-macros]
path = "packages/common/util/macros"

Expand Down Expand Up @@ -484,6 +492,10 @@ path = "packages/services/team-invite/worker"
[workspace.dependencies.rivet-util-captcha]
path = "packages/services/captcha/util"

[workspace.dependencies.util-captcha]
package = "rivet-util-captcha"
path = "packages/services/captcha/util"

[workspace.dependencies.captcha-hcaptcha-config-get]
path = "packages/services/captcha/ops/hcaptcha-config-get"

Expand Down Expand Up @@ -562,6 +574,10 @@ path = "packages/services/nomad/standalone/monitor"
[workspace.dependencies.rivet-util-cdn]
path = "packages/services/cdn/util"

[workspace.dependencies.util-cdn]
package = "rivet-util-cdn"
path = "packages/services/cdn/util"

[workspace.dependencies.cdn-site-get]
path = "packages/services/cdn/ops/site-get"

Expand Down Expand Up @@ -613,6 +629,10 @@ path = "packages/services/cdn/worker"
[workspace.dependencies.rivet-util-team]
path = "packages/services/team/util"

[workspace.dependencies.util-team]
package = "rivet-util-team"
path = "packages/services/team/util"

[workspace.dependencies.team-validate]
path = "packages/services/team/ops/validate"

Expand Down Expand Up @@ -709,12 +729,20 @@ path = "packages/services/cloud/worker"
[workspace.dependencies.rivet-util-job]
path = "packages/services/job/util"

[workspace.dependencies.util-job]
package = "rivet-util-job"
path = "packages/services/job/util"

[workspace.dependencies.job-gc]
path = "packages/services/job/standalone/gc"

[workspace.dependencies.rivet-util-mm]
path = "packages/services/mm/util"

[workspace.dependencies.util-mm]
package = "rivet-util-mm"
path = "packages/services/mm/util"

[workspace.dependencies.mm-gc]
path = "packages/services/mm/standalone/gc"

Expand Down Expand Up @@ -781,6 +809,10 @@ path = "packages/services/build"
[workspace.dependencies.rivet-util-build]
path = "packages/services/build/util"

[workspace.dependencies.util-build]
package = "rivet-util-build"
path = "packages/services/build/util"

[workspace.dependencies.build-default-create]
path = "packages/services/build/standalone/default-create"

Expand Down
90 changes: 45 additions & 45 deletions packages/api/actor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ license.workspace = true
edition.workspace = true

[dependencies]
api-helper = { path = "../../common/api-helper/build" }
chirp-client = { path = "../../common/chirp/client" }
rivet-operation = { path = "../../common/operation/core" }
api-helper.workspace = true
chirp-client.workspace = true
rivet-operation.workspace = true
chrono = "0.4"
http = "0.2"
hyper = { version = "0.14", features = ["server", "http1", "stream", "tcp"] }
lazy_static = "1.4"
rivet-api = { path = "../../../sdks/full/rust" }
rivet-cache = { path = "../../common/cache/build" }
rivet-claims = { path = "../../common/claims" }
rivet-health-checks = { path = "../../common/health-checks" }
rivet-convert = { path = "../../common/convert" }
rivet-pools = { path = "../../common/pools" }
s3-util = { path = "../../common/s3-util" }
rivet-api.workspace = true
rivet-cache.workspace = true
rivet-claims.workspace = true
rivet-health-checks.workspace = true
rivet-convert.workspace = true
rivet-pools.workspace = true
s3-util.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
base64 = "0.13"
Expand All @@ -28,44 +28,44 @@ tracing = "0.1"
tracing-futures = "0.2"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "json", "ansi"] }
url = "2.2.2"
util-team = { package = "rivet-util-team", path = "../../services/team/util" }
util-team.workspace = true
uuid = { version = "1", features = ["v4"] }

build-create = { path = "../../services/build/ops/create" }
build-get = { path = "../../services/build/ops/get" }
build-list-for-env = { path = "../../services/build/ops/list-for-env" }
cluster = { path = "../../services/cluster" }
build = { path = "../../services/build" }
ds = { path = "../../services/ds" }
ds-log-read = { path = "../../services/ds-log/ops/read" }
ds-log-export = { path = "../../services/ds-log/ops/export" }
game-get = { path = "../../services/game/ops/get" }
game-namespace-get = { path = "../../services/game/ops/namespace-get" }
game-version-get = { path = "../../services/game/ops/version-get" }
team-get = { path = "../../services/team/ops/get" }
token-create = { path = "../../services/token/ops/create" }
token-revoke = { path = "../../services/token/ops/revoke" }
upload-complete = { path = "../../services/upload/ops/complete" }
upload-get = { path = "../../services/upload/ops/get" }
user-get = { path = "../../services/user/ops/get" }
user-identity-get = { path = "../../services/user-identity/ops/get" }
user-team-list = { path = "../../services/user/ops/team-list" }
rivet-config = { path = "../../common/config" }
rivet-env = { path = "../../common/env" }
game-resolve-name-id = { version = "0.0.1", path = "../../services/game/ops/resolve-name-id" }
game-namespace-resolve-name-id = { version = "0.0.1", path = "../../services/game/ops/namespace-resolve-name-id" }
build-create.workspace = true
build-get.workspace = true
build-list-for-env.workspace = true
cluster.workspace = true
build.workspace = true
ds.workspace = true
ds-log-read.workspace = true
ds-log-export.workspace = true
game-get.workspace = true
game-namespace-get.workspace = true
game-version-get.workspace = true
team-get.workspace = true
token-create.workspace = true
token-revoke.workspace = true
upload-complete.workspace = true
upload-get.workspace = true
user-get.workspace = true
user-identity-get.workspace = true
user-team-list.workspace = true
rivet-config.workspace = true
rivet-env.workspace = true
game-resolve-name-id = { version = "0.0.1", workspace = true }
game-namespace-resolve-name-id = { version = "0.0.1", workspace = true }

[dev-dependencies]
rivet-connection = { path = "../../common/connection" }
rivet-connection.workspace = true
reqwest = "0.11"

cdn-namespace-domain-create = { path = "../../services/cdn/ops/namespace-domain-create" }
cloud-namespace-token-development-create = { path = "../../services/cloud/ops/namespace-token-development-create" }
cloud-namespace-token-public-create = { path = "../../services/cloud/ops/namespace-token-public-create" }
faker-build = { path = "../../services/faker/ops/build" }
faker-game = { path = "../../services/faker/ops/game" }
faker-game-namespace = { path = "../../services/faker/ops/game-namespace" }
faker-game-version = { path = "../../services/faker/ops/game-version" }
faker-region = { path = "../../services/faker/ops/region" }
game-get = { path = "../../services/game/ops/get" }
region-get = { path = "../../services/region/ops/get" }
cdn-namespace-domain-create.workspace = true
cloud-namespace-token-development-create.workspace = true
cloud-namespace-token-public-create.workspace = true
faker-build.workspace = true
faker-game.workspace = true
faker-game-namespace.workspace = true
faker-game-version.workspace = true
faker-region.workspace = true
game-get.workspace = true
region-get.workspace = true
58 changes: 29 additions & 29 deletions packages/api/auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ license.workspace = true
edition.workspace = true

[dependencies]
rivet-convert = { path = "../../common/convert" }
api-helper = { path = "../../common/api-helper/build" }
rivet-convert.workspace = true
api-helper.workspace = true
async-trait = "0.1"
chirp-client = { path = "../../common/chirp/client" }
rivet-operation = { path = "../../common/operation/core" }
chirp-client.workspace = true
rivet-operation.workspace = true
chrono = "0.4"
headers = "0.3"
http = "0.2"
hyper = { version = "0.14", features = ["server", "http1", "stream", "tcp"] }
lazy_static = "1.4"
prost = "0.10"
rivet-auth-server = { path = "../../common/smithy-output/api-auth/rust-server" }
rivet-cache = { path = "../../common/cache/build" }
rivet-claims = { path = "../../common/claims" }
rivet-health-checks = { path = "../../common/health-checks" }
rivet-pools = { path = "../../common/pools" }
rivet-auth-server.workspace = true
rivet-cache.workspace = true
rivet-claims.workspace = true
rivet-health-checks.workspace = true
rivet-pools.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
Expand All @@ -30,27 +30,27 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "json", "ansi"] }
url = "2.2.2"
uuid = { version = "1", features = ["v4"] }
rivet-api = { path = "../../../sdks/full/rust" }
rivet-api.workspace = true

user-get = { path = "../../services/user/ops/get" }
token-revoke = { path = "../../services/token/ops/revoke" }
captcha-verify = { path = "../../services/captcha/ops/verify" }
email-verification-create = { path = "../../services/email-verification/ops/create" }
email-verification-complete = { path = "../../services/email-verification/ops/complete" }
user-resolve-email = { path = "../../services/user/ops/resolve-email" }
user-token-create = { path = "../../services/user/ops/token-create" }
user-identity-create = { path = "../../services/user-identity/ops/create" }
token-create = { path = "../../services/token/ops/create" }
rivet-config = { path = "../../common/config" }
rivet-env = { path = "../../common/env" }
user = { path = "../../services/user" }
chirp-workflow = { path = "../../common/chirp-workflow/core" }
user-get.workspace = true
token-revoke.workspace = true
captcha-verify.workspace = true
email-verification-create.workspace = true
email-verification-complete.workspace = true
user-resolve-email.workspace = true
user-token-create.workspace = true
user-identity-create.workspace = true
token-create.workspace = true
rivet-config.workspace = true
rivet-env.workspace = true
user.workspace = true
chirp-workflow.workspace = true

[dev-dependencies]
rivet-auth = { path = "../../common/smithy-output/api-auth/rust" }
rivet-connection = { path = "../../common/connection" }
rivet-auth.workspace = true
rivet-connection.workspace = true

faker-user = { path = "../../services/faker/ops/user" }
user-token-create = { path = "../../services/user/ops/token-create" }
debug-email-res = { path = "../../services/debug/ops/email-res" }
user-identity-get = { path = "../../services/user-identity/ops/get" }
faker-user.workspace = true
user-token-create.workspace = true
debug-email-res.workspace = true
user-identity-get.workspace = true
28 changes: 14 additions & 14 deletions packages/api/cf-verification/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ license.workspace = true
edition.workspace = true

[dependencies]
api-helper = { path = "../../common/api-helper/build" }
api-helper.workspace = true
async-trait = "0.1"
bytes = "1.0.1"
chirp-client = { path = "../../common/chirp/client" }
rivet-operation = { path = "../../common/operation/core" }
chirp-client.workspace = true
rivet-operation.workspace = true
chrono = "0.4"
http = "0.2"
hyper = { version = "0.14", features = ["server", "http1", "tcp"] }
lazy_static = "1.4"
prost = "0.10"
rivet-cache = { path = "../../common/cache/build" }
rivet-cf-verification-server = { path = "../../common/smithy-output/api-cf-verification/rust-server" }
rivet-claims = { path = "../../common/claims" }
rivet-health-checks = { path = "../../common/health-checks" }
rivet-pools = { path = "../../common/pools" }
rivet-cache.workspace = true
rivet-cf-verification-server.workspace = true
rivet-claims.workspace = true
rivet-health-checks.workspace = true
rivet-pools.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
Expand All @@ -34,12 +34,12 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
url = "2.2.2"
uuid = { version = "1", features = ["v4"] }

cf-custom-hostname-get = { path = "../../services/cf-custom-hostname/ops/get" }
rivet-config = { path = "../../common/config" }
rivet-env = { path = "../../common/env" }
cf-custom-hostname-get.workspace = true
rivet-config.workspace = true
rivet-env.workspace = true

[dev-dependencies]
rivet-cf-verification = { path = "../../common/smithy-output/api-cf-verification/rust" }
rivet-connection = { path = "../../common/connection" }
rivet-cf-verification.workspace = true
rivet-connection.workspace = true

faker-game = { path = "../../services/faker/ops/game" }
faker-game.workspace = true
Loading
Loading