Prefer libherokubuildpack inventory module (#737)

heroku · Oct 17, 2024 · b27cc75 · b27cc75
1 parent f4ba815
commit b27cc75
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/buildpacks/jvm/Cargo.toml b/buildpacks/jvm/Cargo.toml
@@ -10,18 +10,17 @@ workspace = true
 buildpacks-jvm-shared.workspace = true
 fs_extra = "1"
 indoc = "2"
-libcnb = "=0.23.0"
-libherokubuildpack = { version = "=0.23.0", default-features = false, features = ["digest", "download", "error", "log", "tar"] }
+libcnb = "=0.24.0"
+libherokubuildpack = { version = "=0.24.0", default-features = false, features = ["digest", "download", "error", "inventory", "inventory-sha2", "log", "tar"] }
 serde = { version = "1", features = ["derive"] }
 tempfile = "3"
 url = "2"
 nom = "7"
-inventory = { git = "https://github.com/Malax/inventory", features = ["sha2"] }
 thiserror = "1"
 sha2 = "0.10"
 hex = "0.4"
 toml = "0.8"
 
 [dev-dependencies]
 buildpacks-jvm-shared-test.workspace = true
-libcnb-test = "=0.23.0"
+libcnb-test = "=0.24.0"
diff --git a/buildpacks/jvm/src/layers/openjdk.rs b/buildpacks/jvm/src/layers/openjdk.rs
@@ -6,14 +6,14 @@ use crate::{
     JAVA_TOOL_OPTIONS_ENV_VAR_NAME, JDK_OVERLAY_DIR_NAME,
 };
 use fs_extra::dir::CopyOptions;
-use inventory::artifact::Artifact;
 use libcnb::additional_buildpack_binary_path;
 use libcnb::build::BuildContext;
 use libcnb::data::layer_name;
 use libcnb::layer::{
     CachedLayerDefinition, InvalidMetadataAction, LayerState, RestoredLayerAction,
 };
 use libcnb::layer_env::{LayerEnv, ModificationBehavior, Scope};
+use libherokubuildpack::inventory::artifact::Artifact;
 use serde::Deserialize;
 use serde::Serialize;
 use sha2::Sha256;

diff --git a/buildpacks/jvm/src/main.rs b/buildpacks/jvm/src/main.rs
@@ -23,8 +23,6 @@ pub(crate) use constants::{
     JAVA_TOOL_OPTIONS_ENV_VAR_DELIMITER, JAVA_TOOL_OPTIONS_ENV_VAR_NAME, JDK_OVERLAY_DIR_NAME,
 };
 use indoc::formatdoc;
-use inventory::artifact::{Arch, Os};
-use inventory::inventory::{Inventory, ParseInventoryError};
 use libcnb::build::{BuildContext, BuildResult, BuildResultBuilder};
 use libcnb::buildpack_main;
 use libcnb::data::build_plan::BuildPlanBuilder;
@@ -34,6 +32,8 @@ use libcnb::Buildpack;
 #[cfg(test)]
 use libcnb_test as _;
 use libherokubuildpack::download::DownloadError;
+use libherokubuildpack::inventory::artifact::{Arch, Os};
+use libherokubuildpack::inventory::{Inventory, ParseInventoryError};
 use libherokubuildpack::log::log_warning;
 use sha2::Sha256;
 use std::env::consts;

diff --git a/buildpacks/jvm/src/openjdk_artifact.rs b/buildpacks/jvm/src/openjdk_artifact.rs
@@ -1,5 +1,5 @@
 use crate::openjdk_version::OpenJdkVersion;
-use inventory::version::{ArtifactRequirement, VersionRequirement};
+use libherokubuildpack::inventory::version::{ArtifactRequirement, VersionRequirement};
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;