Merge branch 'main' into deps/jjbustamante/update-to-lifecycle-0_17_1

acceptance/acceptance_test.go

@@ -635,7 +635,7 @@ func testAcceptance(
 	var (
 		pack, createBuilderPack *invoke.PackInvoker
 		buildpackManager        buildpacks.BuildModuleManager
-		bpDir                   = buildModulesDir(lifecycle.EarliestBuildpackAPIVersion())
+		bpDir                   = buildModulesDir()
 		assert                  = h.NewAssertionManager(t)
 	)
 
@@ -649,7 +649,6 @@ func testAcceptance(
 		buildpackManager = buildpacks.NewBuildModuleManager(
 			t,
 			assert,
-			buildpacks.WithBuildpackAPIVersion(lifecycle.EarliestBuildpackAPIVersion()),
 		)
 	})
 
@@ -2898,8 +2897,8 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 	})
 }
 
-func buildModulesDir(bpAPIVersion string) string {
-	return filepath.Join("testdata", "mock_buildpacks", bpAPIVersion)
+func buildModulesDir() string {
+	return filepath.Join("testdata", "mock_buildpacks")
 }
 
 func createComplexBuilder(t *testing.T,

acceptance/buildpacks/manager.go

@@ -7,8 +7,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/buildpacks/pack/internal/builder"
-
 	"github.com/buildpacks/pack/testhelpers"
 )
 
@@ -20,17 +18,11 @@ type BuildModuleManager struct {
 
 type BuildModuleManagerModifier func(b *BuildModuleManager)
 
-func WithBuildpackAPIVersion(apiVersion string) func(b *BuildModuleManager) {
-	return func(b *BuildModuleManager) {
-		b.sourceDir = filepath.Join("testdata", "mock_buildpacks", apiVersion)
-	}
-}
-
 func NewBuildModuleManager(t *testing.T, assert testhelpers.AssertionManager, modifiers ...BuildModuleManagerModifier) BuildModuleManager {
 	m := BuildModuleManager{
 		testObject: t,
 		assert:     assert,
-		sourceDir:  filepath.Join("testdata", "mock_buildpacks", builder.DefaultBuildpackAPIVersion),
+		sourceDir:  filepath.Join("testdata", "mock_buildpacks"),
 	}
 
 	for _, mod := range modifiers {