move LibrariesLoader under arduino/builder

arduino · Aug 31, 2023 · 82f9dd7 · 82f9dd7
1 parent 85fa332
commit 82f9dd7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/legacy/builder/libraries_loader.go → arduino/builder/libraries.go b/legacy/builder/libraries_loader.go → arduino/builder/libraries.go
diff --git a/legacy/builder/container_setup.go b/legacy/builder/container_setup.go
@@ -16,6 +16,7 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/pkg/errors"
 )
@@ -37,7 +38,7 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
 		return errors.New(tr("Sketch cannot be located in build path. Please specify a different build path"))
 	}
 
-	lm, libsResolver, verboseOut, err := LibrariesLoader(
+	lm, libsResolver, verboseOut, err := builder.LibrariesLoader(
 		ctx.UseCachedLibrariesResolution, ctx.LibrariesManager,
 		ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 		ctx.ActualPlatform, ctx.TargetPlatform,

diff --git a/legacy/builder/test/libraries_loader_test.go b/legacy/builder/test/libraries_loader_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-cli/arduino/libraries"
-	"github.com/arduino/arduino-cli/legacy/builder"
+	"github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"