Moving under github.com/arduino imports

Author: cmaglie

add_additional_entries_to_context.go

@@ -33,7 +33,7 @@ import (
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/cores"
+	"github.com/arduino/arduino-cli/arduino/cores"
 )
 
 type AddAdditionalEntriesToContext struct{}

arduino-builder/main.go

@@ -38,20 +38,19 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"strings"
-	"syscall"
-
 	"runtime/pprof"
 	"runtime/trace"
+	"strings"
+	"syscall"
 
 	"github.com/arduino/arduino-builder"
 	"github.com/arduino/arduino-builder/gohasissues"
 	"github.com/arduino/arduino-builder/grpc"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-map"
-	"github.com/bcmi-labs/arduino-cli/arduino/cores"
 	"github.com/go-errors/errors"
 )
 

container_find_includes.go

@@ -117,8 +117,8 @@ import (
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/go-paths-helper"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries"
 
 	"github.com/go-errors/errors"
 )

fail_if_imported_library_is_wrong.go

@@ -33,7 +33,7 @@ import (
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries"
+	"github.com/arduino/arduino-cli/arduino/libraries"
 )
 
 type FailIfImportedLibraryIsWrong struct{}

grpc/rpc.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/go-paths-helper"
-	"github.com/bcmi-labs/arduino-cli/arduino/cores"
 
 	builder "github.com/arduino/arduino-builder"
 	"github.com/arduino/arduino-builder/i18n"

hardware_loader.go

@@ -32,7 +32,7 @@ package builder
 import (
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
+	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 )
 
 type HardwareLoader struct{}

libraries_loader.go

@@ -32,12 +32,11 @@ package builder
 import (
 	"os"
 
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesresolver"
-
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries"
+	"github.com/arduino/arduino-cli/arduino/libraries"
+	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
+	"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
 )
 
 type LibrariesLoader struct{}

phases/libraries_builder.go

@@ -38,9 +38,9 @@ import (
 	"github.com/arduino/arduino-builder/i18n"
 	"github.com/arduino/arduino-builder/types"
 	"github.com/arduino/arduino-builder/utils"
+	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-map"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries"
 )
 
 var PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC = map[string]bool{".a": true}

resolve_library.go

@@ -33,7 +33,7 @@ import (
 	"fmt"
 
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/libraries"
+	"github.com/arduino/arduino-cli/arduino/libraries"
 )
 
 func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {

rewrite_hardware_keys.go

@@ -32,7 +32,7 @@ package builder
 import (
 	"github.com/arduino/arduino-builder/constants"
 	"github.com/arduino/arduino-builder/types"
-	"github.com/bcmi-labs/arduino-cli/arduino/cores"
+	"github.com/arduino/arduino-cli/arduino/cores"
 )
 
 type RewriteHardwareKeys struct{}