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

Switch away from workspace-defined dependencies #614

Merged
merged 1 commit into from
Nov 17, 2023
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
6 changes: 0 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,5 @@ edition = "2021"
publish = false

[workspace.dependencies]
# libcnb has a much bigger impact on buildpack behaviour than any other dependencies,
# so it's pinned to an exact version to isolate it from lockfile refreshes.
libcnb = "=0.15.0"
libcnb-test = "=0.15.0"
libherokubuildpack = "=0.15.0"
toml = "0.8"
buildpacks-jvm-shared = { path = "shared" }
buildpacks-jvm-shared-test = { path = "shared-test" }
10 changes: 5 additions & 5 deletions buildpacks/gradle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ edition.workspace = true
publish.workspace = true

[dependencies]
libcnb.workspace = true
libherokubuildpack.workspace = true
serde = { version = "1", features = ["derive"] }
buildpacks-jvm-shared.workspace = true
nom = "7"
indoc = "2"
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"
nom = "7"
serde = { version = "1", features = ["derive"] }

[dev-dependencies]
libcnb-test.workspace = true
buildpacks-jvm-shared-test.workspace = true
libcnb-test = "=0.15.0"
12 changes: 6 additions & 6 deletions buildpacks/jvm-function-invoker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish.workspace = true

[dependencies]
indoc = "2"
libcnb.workspace = true
libherokubuildpack.workspace = true
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"
serde = "1"
thiserror = "1"
toml.workspace = true
toml = "0.8"

[dev-dependencies]
tempfile = "3"
libcnb-test.workspace = true
ureq = "2"
base64 = "0.21"
buildpacks-jvm-shared-test.workspace = true
libcnb-test = "=0.15.0"
tempfile = "3"
ureq = "2"
6 changes: 3 additions & 3 deletions buildpacks/jvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ publish.workspace = true
buildpacks-jvm-shared.workspace = true
fs_extra = "1"
indoc = "2"
libcnb.workspace = true
libherokubuildpack.workspace = true
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"
serde = { version = "1", features = ["derive"] }
tempfile = "3"
ureq = "2"
url = "2"

[dev-dependencies]
libcnb-test.workspace = true
buildpacks-jvm-shared-test.workspace = true
libcnb-test = "=0.15.0"
8 changes: 4 additions & 4 deletions buildpacks/maven/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ publish.workspace = true
buildpacks-jvm-shared.workspace = true
flate2 = "1"
indoc = "2"
libcnb.workspace = true
libherokubuildpack.workspace = true
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"
regex = "1"
serde = { version = "1", features = ["derive"] }
shell-words = "1"
tar = "0.4"
tempfile = "3"

[dev-dependencies]
libcnb-test.workspace = true
java-properties = "2"
buildpacks-jvm-shared-test.workspace = true
java-properties = "2"
libcnb-test = "=0.15.0"
12 changes: 6 additions & 6 deletions buildpacks/sbt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ edition.workspace = true
publish.workspace = true

[dependencies]
libcnb.workspace = true
libherokubuildpack.workspace = true
buildpacks-jvm-shared.workspace = true
indoc = "2"
java-properties = "2"
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"
semver = { version = "1", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
shell-words = "1"
tempfile = "3"
thiserror = "1"
semver = { version = "1", features = ["serde"] }
shell-words = "1"
buildpacks-jvm-shared.workspace = true

[dev-dependencies]
libcnb-test.workspace = true
buildpacks-jvm-shared-test.workspace = true
libcnb-test = "=0.15.0"
ureq = "2"
4 changes: 2 additions & 2 deletions shared-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition.workspace = true
publish.workspace = true

[dependencies]
ureq = "2"
exponential-backoff = "1"
libcnb-test.workspace = true
libcnb-test = "=0.15.0"
ureq = "2"
4 changes: 2 additions & 2 deletions shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ publish.workspace = true

[dependencies]
indoc = "2"
libherokubuildpack.workspace = true
libcnb.workspace = true
java-properties = "2"
libcnb = "=0.15.0"
libherokubuildpack = "=0.15.0"