Skip to content

Commit

Permalink
Merge pull request #217 from palantir/conjure-4
Browse files Browse the repository at this point in the history
Bump to Conjure 4
  • Loading branch information
sfackler authored Jun 4, 2024
2 parents 4945da1 + bc52f21 commit 1b43b3a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 16 deletions.
9 changes: 8 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ save_deps: &SAVE_DEPS

version: 2
jobs:
build:
circle-all:
docker:
- image: rust:1.75.0
environment:
Expand All @@ -38,3 +38,10 @@ jobs:
- run: cargo clippy --all --all-targets
- run: cargo test --all
- *SAVE_DEPS

workflows:
version: 2
main:
jobs:
- circle-all:
filters: { tags: { only: /.*/ } }
12 changes: 6 additions & 6 deletions conjure-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ readme = "../README.md"
arc-swap = "1.0"
base64 = "0.22"
bytes = "1.0"
conjure-error = "4.0.0-rc3"
conjure-http = "4.0.0-rc3"
conjure-object = "4.0.0-rc3"
conjure-error = "4"
conjure-http = "4"
conjure-object = "4"
conjure-runtime-config = { version = "5.0.0-rc1", path = "../conjure-runtime-config" }
conjure-serde = "4.0.0-rc3"
conjure-serde = "4"
flate2 = "1.0"
futures = "0.3"
http-body = "1"
Expand Down Expand Up @@ -57,12 +57,12 @@ tower-layer = "0.3"
tower-service = "0.3"
url = "2.0"
webpki-roots = "0.26"
witchcraft-log = "4.0.0-rc1"
witchcraft-log = "4"
witchcraft-metrics = "1"
zipkin = "0.4"

[dev-dependencies]
conjure-codegen = { version = "4.0.0-rc3", features = ["example-types"] }
conjure-codegen = { version = "4", features = ["example-types"] }
futures-test = "0.3"
hyper = { version = "1", features = ["server"] }
hyper-rustls = { version = "0.27", default-features = false, features = [
Expand Down
8 changes: 4 additions & 4 deletions conjure-verification-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ links = "conjure-verification" # a hack to pass info upstr

[build-dependencies]
attohttpc = "0.28"
conjure-codegen = "4.0.0-rc3"
conjure-codegen = "4"
flate2 = "1.0"
tar = "0.4"

[dependencies]
conjure-error = "4.0.0-rc3"
conjure-http = "4.0.0-rc3"
conjure-object = "4.0.0-rc3"
conjure-error = "4"
conjure-http = "4"
conjure-object = "4"
10 changes: 5 additions & 5 deletions conjure-verification/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doctest = false
harness = false

[build-dependencies]
conjure-serde = "4.0.0-rc3"
conjure-serde = "4"
serde_yaml = "0.9"
heck = "0.5"
syn = "2.0"
Expand All @@ -23,10 +23,10 @@ conjure-verification-api = { path = "../conjure-verification-api" }
conjure-verification-api = { path = "../conjure-verification-api" }

[dev-dependencies]
conjure-object = "4.0.0-rc3"
conjure-error = "4.0.0-rc3"
conjure-http = "4.0.0-rc3"
conjure-serde = "4.0.0-rc3"
conjure-object = "4"
conjure-error = "4"
conjure-http = "4"
conjure-serde = "4"
tokio = { version = "1.0", features = ["full"] }
witchcraft-metrics = "1"

Expand Down

0 comments on commit 1b43b3a

Please sign in to comment.