From 82f9dd77eae44d648a73ae6f7c172b23b38451fe Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 19:34:28 +0200 Subject: [PATCH] move LibrariesLoader under arduino/builder --- .../libraries_loader.go => arduino/builder/libraries.go | 0 legacy/builder/container_setup.go | 3 ++- legacy/builder/test/libraries_loader_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename legacy/builder/libraries_loader.go => arduino/builder/libraries.go (100%) diff --git a/legacy/builder/libraries_loader.go b/arduino/builder/libraries.go similarity index 100% rename from legacy/builder/libraries_loader.go rename to arduino/builder/libraries.go diff --git a/legacy/builder/container_setup.go b/legacy/builder/container_setup.go index 4d2d8a6d22d..a0ee98d86f6 100644 --- 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 index 7b7fcb12750..8ef2c629a24 100644 --- 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"