Skip to content

Commit e866372

Browse files
cmagliecmaglie
committed
Moving under github.com/arduino imports
1 parent beb2ff2 commit e866372

23 files changed

+32
-38
lines changed

‎add_additional_entries_to_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/arduino/arduino-builder/constants"
3434
"github.com/arduino/arduino-builder/i18n"
3535
"github.com/arduino/arduino-builder/types"
36-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
36+
"github.com/arduino/arduino-cli/arduino/cores"
3737
)
3838

3939
type AddAdditionalEntriesToContext struct{}

‎arduino-builder/main.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,19 @@ import (
3838
"os"
3939
"os/exec"
4040
"runtime"
41-
"strings"
42-
"syscall"
43-
4441
"runtime/pprof"
4542
"runtime/trace"
43+
"strings"
44+
"syscall"
4645

4746
"github.com/arduino/arduino-builder"
4847
"github.com/arduino/arduino-builder/gohasissues"
4948
"github.com/arduino/arduino-builder/grpc"
5049
"github.com/arduino/arduino-builder/i18n"
5150
"github.com/arduino/arduino-builder/types"
51+
"github.com/arduino/arduino-cli/arduino/cores"
5252
"github.com/arduino/go-paths-helper"
5353
"github.com/arduino/go-properties-map"
54-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
5554
"github.com/go-errors/errors"
5655
)
5756

‎container_find_includes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ import (
117117
"github.com/arduino/arduino-builder/i18n"
118118
"github.com/arduino/arduino-builder/types"
119119
"github.com/arduino/arduino-builder/utils"
120+
"github.com/arduino/arduino-cli/arduino/libraries"
120121
"github.com/arduino/go-paths-helper"
121-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
122122

123123
"github.com/go-errors/errors"
124124
)

‎fail_if_imported_library_is_wrong.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/arduino/arduino-builder/constants"
3434
"github.com/arduino/arduino-builder/i18n"
3535
"github.com/arduino/arduino-builder/types"
36-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
36+
"github.com/arduino/arduino-cli/arduino/libraries"
3737
)
3838

3939
type FailIfImportedLibraryIsWrong struct{}

‎grpc/rpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"os"
99
"strings"
1010

11+
"github.com/arduino/arduino-cli/arduino/cores"
1112
"github.com/arduino/go-paths-helper"
12-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
1313

1414
builder "github.com/arduino/arduino-builder"
1515
"github.com/arduino/arduino-builder/i18n"

‎hardware_loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ package builder
3232
import (
3333
"github.com/arduino/arduino-builder/i18n"
3434
"github.com/arduino/arduino-builder/types"
35-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
35+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
3636
)
3737

3838
type HardwareLoader struct{}

‎libraries_loader.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ package builder
3232
import (
3333
"os"
3434

35-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
36-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesresolver"
37-
3835
"github.com/arduino/arduino-builder/i18n"
3936
"github.com/arduino/arduino-builder/types"
40-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
37+
"github.com/arduino/arduino-cli/arduino/libraries"
38+
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
39+
"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
4140
)
4241

4342
type LibrariesLoader struct{}

‎phases/libraries_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
"github.com/arduino/arduino-builder/i18n"
3939
"github.com/arduino/arduino-builder/types"
4040
"github.com/arduino/arduino-builder/utils"
41+
"github.com/arduino/arduino-cli/arduino/libraries"
4142
"github.com/arduino/go-paths-helper"
4243
"github.com/arduino/go-properties-map"
43-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
4444
)
4545

4646
var PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC = map[string]bool{".a": true}

‎resolve_library.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"fmt"
3434

3535
"github.com/arduino/arduino-builder/types"
36-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
36+
"github.com/arduino/arduino-cli/arduino/libraries"
3737
)
3838

3939
func ResolveLibrary(ctx *types.Context, header string) *libraries.Library {

‎rewrite_hardware_keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ package builder
3232
import (
3333
"github.com/arduino/arduino-builder/constants"
3434
"github.com/arduino/arduino-builder/types"
35-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
35+
"github.com/arduino/arduino-cli/arduino/cores"
3636
)
3737

3838
type RewriteHardwareKeys struct{}

‎setup_build_properties.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838

3939
"github.com/arduino/arduino-builder/types"
4040
"github.com/arduino/arduino-builder/utils"
41+
"github.com/arduino/arduino-cli/arduino/cores"
4142
"github.com/arduino/go-properties-map"
4243
"github.com/arduino/go-timeutils"
43-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
4444
)
4545

4646
type SetupBuildProperties struct{}

‎test/add_build_board_property_if_missing_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ import (
3333
"path/filepath"
3434
"testing"
3535

36-
"github.com/arduino/go-paths-helper"
37-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
38-
3936
"github.com/arduino/arduino-builder"
4037
"github.com/arduino/arduino-builder/constants"
4138
"github.com/arduino/arduino-builder/types"
39+
"github.com/arduino/arduino-cli/arduino/cores"
40+
"github.com/arduino/go-paths-helper"
4241
"github.com/stretchr/testify/require"
4342
)
4443

‎test/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import (
4040
"github.com/arduino/arduino-builder/constants"
4141
"github.com/arduino/arduino-builder/types"
4242
"github.com/arduino/arduino-builder/utils"
43+
"github.com/arduino/arduino-cli/arduino/libraries"
4344
paths "github.com/arduino/go-paths-helper"
44-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
4545
"github.com/go-errors/errors"
4646
"github.com/stretchr/testify/assert"
4747
)

‎test/helper_tools_downloader.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@ import (
4242
"strings"
4343
"testing"
4444

45-
"github.com/arduino/go-paths-helper"
46-
4745
"github.com/arduino/arduino-builder/constants"
4846
"github.com/arduino/arduino-builder/gohasissues"
4947
"github.com/arduino/arduino-builder/i18n"
5048
"github.com/arduino/arduino-builder/utils"
49+
"github.com/arduino/go-paths-helper"
5150
"github.com/arduino/go-properties-map"
5251
"github.com/go-errors/errors"
5352
)

‎test/libraries_loader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"github.com/arduino/arduino-builder"
3838
"github.com/arduino/arduino-builder/constants"
3939
"github.com/arduino/arduino-builder/types"
40+
"github.com/arduino/arduino-cli/arduino/libraries"
4041
paths "github.com/arduino/go-paths-helper"
41-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
4242
"github.com/stretchr/testify/require"
4343
)
4444

‎test/rewrite_hardware_keys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434

3535
"github.com/arduino/arduino-builder"
3636
"github.com/arduino/arduino-builder/types"
37+
"github.com/arduino/arduino-cli/arduino/cores"
3738
properties "github.com/arduino/go-properties-map"
38-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
3939
"github.com/stretchr/testify/require"
4040
)
4141

‎test/sketch_source_merger_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ import (
3535
"strings"
3636
"testing"
3737

38-
"github.com/arduino/go-paths-helper"
39-
4038
"github.com/arduino/arduino-builder"
4139
"github.com/arduino/arduino-builder/types"
40+
"github.com/arduino/go-paths-helper"
4241
"github.com/stretchr/testify/require"
4342
)
4443

‎test/tools_loader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535

3636
"github.com/arduino/arduino-builder"
3737
"github.com/arduino/arduino-builder/types"
38+
"github.com/arduino/arduino-cli/arduino/cores"
3839
paths "github.com/arduino/go-paths-helper"
39-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
4040
"github.com/stretchr/testify/require"
4141
)
4242

‎test/unused_compiled_libraries_remover_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434

3535
"github.com/arduino/arduino-builder"
3636
"github.com/arduino/arduino-builder/types"
37+
"github.com/arduino/arduino-cli/arduino/libraries"
3738
paths "github.com/arduino/go-paths-helper"
38-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
3939
"github.com/stretchr/testify/require"
4040
)
4141

‎types/context.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ package types
33
import (
44
"strings"
55

6-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
7-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesresolver"
8-
96
"github.com/arduino/arduino-builder/i18n"
7+
"github.com/arduino/arduino-cli/arduino/cores"
8+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
9+
"github.com/arduino/arduino-cli/arduino/libraries"
10+
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
11+
"github.com/arduino/arduino-cli/arduino/libraries/librariesresolver"
1012
"github.com/arduino/go-paths-helper"
1113
"github.com/arduino/go-properties-map"
12-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
13-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
14-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
1514
)
1615

1716
type ProgressStruct struct {

‎types/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"fmt"
3434
"strconv"
3535

36+
"github.com/arduino/arduino-cli/arduino/libraries"
3637
"github.com/arduino/go-paths-helper"
37-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
3838
)
3939

4040
type SourceFile struct {

‎unused_compiled_libraries_remover.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/arduino/arduino-builder/i18n"
3434
"github.com/arduino/arduino-builder/types"
3535
"github.com/arduino/arduino-builder/utils"
36-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
36+
"github.com/arduino/arduino-cli/arduino/libraries"
3737
)
3838

3939
type UnusedCompiledLibrariesRemover struct{}

‎warn_about_platform_rewrites.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434

3535
"github.com/arduino/arduino-builder/constants"
3636
"github.com/arduino/arduino-builder/types"
37-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
37+
"github.com/arduino/arduino-cli/arduino/cores"
3838
)
3939

4040
type WarnAboutPlatformRewrites struct{}

0 commit comments

Comments
 (0)