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

Remove commands that were moved to libpak-tools & move carton package… #373

Merged
merged 1 commit into from
Oct 30, 2024
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
8 changes: 4 additions & 4 deletions build.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ package libpak
import (
"github.com/buildpacks/libcnb/v2"

"github.com/paketo-buildpacks/libpak/v2/internal"
"github.com/paketo-buildpacks/libpak/v2/log"
"github.com/paketo-buildpacks/libpak/v2/utils"
)

// Build is called by the main function of a buildpack, for build.
func Build(builder libcnb.BuildFunc, options ...libcnb.Option) {
libcnb.Build(buildDelegate{delegate: builder}.Build,
libcnb.NewConfig(append([]libcnb.Option{
libcnb.WithEnvironmentWriter(internal.NewEnvironmentWriter()),
libcnb.WithExitHandler(internal.NewExitHandler()),
libcnb.WithTOMLWriter(internal.NewTOMLWriter()),
libcnb.WithEnvironmentWriter(utils.NewEnvironmentWriter()),
libcnb.WithExitHandler(utils.NewExitHandler()),
libcnb.WithTOMLWriter(utils.NewTOMLWriter()),
}, options...)...))
}

Expand Down
4 changes: 2 additions & 2 deletions buildmodule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/internal"
"github.com/paketo-buildpacks/libpak/v2/log"
"github.com/paketo-buildpacks/libpak/v2/sbom"
"github.com/paketo-buildpacks/libpak/v2/utils"
)

func testBuildpack(t *testing.T, context spec.G, it spec.S) {
Expand All @@ -56,7 +56,7 @@ func testBuildpack(t *testing.T, context spec.G, it spec.S) {
},
}

bytes, err := internal.Marshal(dependency)
bytes, err := utils.Marshal(dependency)
Expect(err).NotTo(HaveOccurred())

var newDependency libpak.BuildModuleDependency
Expand Down
71 changes: 0 additions & 71 deletions carton/build_image_dependency.go

This file was deleted.

74 changes: 0 additions & 74 deletions carton/build_image_dependency_test.go

This file was deleted.

195 changes: 0 additions & 195 deletions carton/buildmodule_dependency.go

This file was deleted.

Loading