Skip to content

Commit b249bb5

Browse files
cmagliecmaglie
committed
Adjusted imports for github.com/arduino
1 parent 286d4b6 commit b249bb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+177
-196
lines changed

‎Gopkg.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[[constraint]]
2929
name = "github.com/arduino/arduino-builder"
3030
branch = "cli-inception"
31-
source = "github.com/bcmi-labs/arduino-builder"
31+
source = "github.com/arduino/arduino-builder"
3232

3333
[[constraint]]
3434
branch = "master"

‎arduino/cores/cores.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/arduino/go-paths-helper"
2424

25+
"github.com/arduino/arduino-cli/arduino/resources"
2526
properties "github.com/arduino/go-properties-map"
26-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
2727
"go.bug.st/relaxed-semver"
2828
)
2929

‎arduino/cores/packageindex/index.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"encoding/json"
2222
"fmt"
2323

24+
"github.com/arduino/arduino-cli/arduino/cores"
25+
"github.com/arduino/arduino-cli/arduino/resources"
2426
"github.com/arduino/go-paths-helper"
25-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
26-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
2727
"go.bug.st/relaxed-semver"
2828
)
2929

‎arduino/cores/packagemanager/download.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"fmt"
2222
"os"
2323

24-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
25-
"github.com/bcmi-labs/arduino-cli/common/formatter/output"
24+
"github.com/arduino/arduino-cli/arduino/cores"
25+
"github.com/arduino/arduino-cli/common/formatter/output"
2626
"github.com/cavaliercoder/grab"
2727
"go.bug.st/relaxed-semver"
2828
)

‎arduino/cores/packagemanager/install_uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package packagemanager
2020
import (
2121
"fmt"
2222

23-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
23+
"github.com/arduino/arduino-cli/arduino/cores"
2424
)
2525

2626
// InstallPlatform installs a specific release of a platform.

‎arduino/cores/packagemanager/loader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"path/filepath"
2424
"strings"
2525

26+
"github.com/arduino/arduino-cli/arduino/cores"
27+
"github.com/arduino/arduino-cli/configs"
2628
"github.com/arduino/go-paths-helper"
2729
properties "github.com/arduino/go-properties-map"
28-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
29-
"github.com/bcmi-labs/arduino-cli/configs"
3030
"go.bug.st/relaxed-semver"
3131
)
3232

‎arduino/cores/packagemanager/package_manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"path"
2525
"strings"
2626

27+
"github.com/arduino/arduino-cli/arduino/cores"
28+
"github.com/arduino/arduino-cli/arduino/cores/packageindex"
2729
"github.com/arduino/go-paths-helper"
2830
properties "github.com/arduino/go-properties-map"
29-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
30-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packageindex"
3131
"github.com/sirupsen/logrus"
3232
"go.bug.st/relaxed-semver"
3333
)

‎arduino/cores/packagemanager/package_manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package packagemanager_test
2020
import (
2121
"testing"
2222

23+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2324
"github.com/arduino/go-paths-helper"
24-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
2525
"github.com/stretchr/testify/require"
2626
)
2727

‎arduino/cores/tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"regexp"
2222
"runtime"
2323

24+
"github.com/arduino/arduino-cli/arduino/resources"
2425
"github.com/arduino/go-paths-helper"
2526
properties "github.com/arduino/go-properties-map"
26-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
2727
"go.bug.st/relaxed-semver"
2828
)
2929

‎arduino/libraries/libraries.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package libraries
2020
import (
2121
"fmt"
2222

23+
"github.com/arduino/arduino-cli/arduino/cores"
2324
"github.com/arduino/go-paths-helper"
24-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
2525
semver "go.bug.st/relaxed-semver"
2626
)
2727

‎arduino/libraries/librariesindex/index.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package librariesindex
2020
import (
2121
"sort"
2222

23-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
24-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
23+
"github.com/arduino/arduino-cli/arduino/libraries"
24+
"github.com/arduino/arduino-cli/arduino/resources"
2525
"go.bug.st/relaxed-semver"
2626
)
2727

‎arduino/libraries/librariesindex/json.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/go-paths-helper"
2525
semver "go.bug.st/relaxed-semver"
2626

27-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
27+
"github.com/arduino/arduino-cli/arduino/resources"
2828
)
2929

3030
type indexJSON struct {

‎arduino/libraries/librariesmanager/install.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ package librariesmanager
2020
import (
2121
"fmt"
2222

23-
"github.com/bcmi-labs/arduino-cli/common/formatter"
24-
23+
"github.com/arduino/arduino-cli/arduino/libraries"
24+
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
25+
"github.com/arduino/arduino-cli/arduino/utils"
26+
"github.com/arduino/arduino-cli/common/formatter"
2527
"github.com/arduino/go-paths-helper"
26-
27-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
28-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesindex"
29-
"github.com/bcmi-labs/arduino-cli/arduino/utils"
3028
)
3129

3230
// Install installs a library and returns the installed path.

‎arduino/libraries/librariesmanager/librariesmanager.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121
"fmt"
2222
"os"
2323

24+
"github.com/arduino/arduino-cli/arduino/cores"
25+
"github.com/arduino/arduino-cli/arduino/libraries"
26+
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
2427
paths "github.com/arduino/go-paths-helper"
25-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
26-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesindex"
28+
"github.com/pmylund/sortutil"
2729
"github.com/sirupsen/logrus"
2830
semver "go.bug.st/relaxed-semver"
29-
30-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
31-
"github.com/pmylund/sortutil"
3231
)
3332

3433
// LibrariesManager keeps the current status of the libraries in the system

‎arduino/libraries/librariesresolver/cpp.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
26-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
27-
"github.com/bcmi-labs/arduino-cli/arduino/utils"
25+
"github.com/arduino/arduino-cli/arduino/libraries"
26+
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
27+
"github.com/arduino/arduino-cli/arduino/utils"
2828
"github.com/sirupsen/logrus"
2929
)
3030

‎arduino/libraries/librariesresolver/cpp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package librariesresolver
2020
import (
2121
"testing"
2222

23-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
23+
"github.com/arduino/arduino-cli/arduino/libraries"
2424
"github.com/stretchr/testify/require"
2525
)
2626

‎auth/auth_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"os"
2626
"testing"
2727

28-
"github.com/bcmi-labs/arduino-cli/auth"
28+
"github.com/arduino/arduino-cli/auth"
2929
)
3030

3131
var (

‎commands/board/attach.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
"strings"
2525
"time"
2626

27+
"github.com/arduino/arduino-cli/arduino/cores"
28+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
29+
"github.com/arduino/arduino-cli/commands"
30+
"github.com/arduino/arduino-cli/common/formatter"
2731
discovery "github.com/arduino/board-discovery"
2832
paths "github.com/arduino/go-paths-helper"
29-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
30-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
31-
"github.com/bcmi-labs/arduino-cli/commands"
32-
"github.com/bcmi-labs/arduino-cli/common/formatter"
3333
"github.com/bcmi-labs/arduino-modules/sketches"
3434
"github.com/sirupsen/logrus"
3535
"github.com/spf13/cobra"

‎commands/board/board.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package board
1919

2020
import (
21-
"github.com/bcmi-labs/arduino-cli/commands"
21+
"github.com/arduino/arduino-cli/commands"
2222
"github.com/spf13/cobra"
2323
)
2424

‎commands/board/list.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ import (
2121
"fmt"
2222
"time"
2323

24-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
25-
26-
"github.com/bcmi-labs/arduino-cli/commands"
27-
"github.com/codeclysm/cc"
28-
29-
"github.com/bcmi-labs/arduino-cli/common/formatter"
30-
"github.com/bcmi-labs/arduino-cli/common/formatter/output"
31-
24+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
25+
"github.com/arduino/arduino-cli/commands"
26+
"github.com/arduino/arduino-cli/common/formatter"
27+
"github.com/arduino/arduino-cli/common/formatter/output"
3228
"github.com/arduino/board-discovery"
29+
"github.com/codeclysm/cc"
3330
"github.com/spf13/cobra"
3431
)
3532

‎commands/board/listall.go

+3-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ package board
2020
import (
2121
"sort"
2222

23-
"github.com/bcmi-labs/arduino-cli/commands"
24-
25-
"github.com/bcmi-labs/arduino-cli/common/formatter"
26-
"github.com/bcmi-labs/arduino-cli/common/formatter/output"
27-
23+
"github.com/arduino/arduino-cli/commands"
24+
"github.com/arduino/arduino-cli/common/formatter"
25+
"github.com/arduino/arduino-cli/common/formatter/output"
2826
"github.com/spf13/cobra"
2927
)
3028

‎commands/commands.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424

2525
"github.com/arduino/go-paths-helper"
2626

27-
"github.com/bcmi-labs/arduino-cli/arduino/libraries"
28-
"github.com/bcmi-labs/arduino-cli/arduino/libraries/librariesmanager"
29-
"github.com/bcmi-labs/arduino-cli/arduino/sketches"
30-
"github.com/bcmi-labs/arduino-cli/configs"
27+
"github.com/arduino/arduino-cli/arduino/libraries"
28+
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
29+
"github.com/arduino/arduino-cli/arduino/sketches"
30+
"github.com/arduino/arduino-cli/configs"
3131
sk "github.com/bcmi-labs/arduino-modules/sketches"
3232

33-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
34-
"github.com/bcmi-labs/arduino-cli/common/formatter"
33+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
34+
"github.com/arduino/arduino-cli/common/formatter"
3535
"github.com/sirupsen/logrus"
3636
)
3737

‎commands/commands_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"testing"
2727

28+
"github.com/arduino/arduino-cli/commands/root"
2829
"github.com/arduino/go-paths-helper"
29-
"github.com/bcmi-labs/arduino-cli/commands/root"
3030
"github.com/bouk/monkey"
3131
"github.com/stretchr/testify/assert"
3232
"github.com/stretchr/testify/require"

‎commands/compile/compile.go

+7-9
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,16 @@ import (
2424
"sort"
2525
"strings"
2626

27-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
28-
29-
"github.com/arduino/go-paths-helper"
30-
3127
builder "github.com/arduino/arduino-builder"
3228
"github.com/arduino/arduino-builder/types"
29+
"github.com/arduino/arduino-cli/arduino/cores"
30+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
31+
"github.com/arduino/arduino-cli/commands"
32+
"github.com/arduino/arduino-cli/common/formatter"
33+
"github.com/arduino/arduino-cli/common/formatter/output"
34+
"github.com/arduino/arduino-cli/configs"
35+
"github.com/arduino/go-paths-helper"
3336
properties "github.com/arduino/go-properties-map"
34-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
35-
"github.com/bcmi-labs/arduino-cli/commands"
36-
"github.com/bcmi-labs/arduino-cli/common/formatter"
37-
"github.com/bcmi-labs/arduino-cli/common/formatter/output"
38-
"github.com/bcmi-labs/arduino-cli/configs"
3937
"github.com/sirupsen/logrus"
4038
"github.com/spf13/cobra"
4139
)

‎commands/compile/ctags.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
package compile
1919

2020
import (
21-
"github.com/bcmi-labs/arduino-cli/arduino/cores"
22-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
23-
"github.com/bcmi-labs/arduino-cli/arduino/resources"
21+
"github.com/arduino/arduino-cli/arduino/cores"
22+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
23+
"github.com/arduino/arduino-cli/arduino/resources"
2424
"go.bug.st/relaxed-semver"
2525
)
2626

‎commands/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package config
1919

2020
import (
21-
"github.com/bcmi-labs/arduino-cli/commands"
21+
"github.com/arduino/arduino-cli/commands"
2222
"github.com/spf13/cobra"
2323
)
2424

‎commands/config/dump.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"fmt"
2222
"os"
2323

24-
"github.com/bcmi-labs/arduino-cli/commands"
25-
"github.com/bcmi-labs/arduino-cli/common/formatter"
24+
"github.com/arduino/arduino-cli/commands"
25+
"github.com/arduino/arduino-cli/common/formatter"
2626
"github.com/sirupsen/logrus"
2727
"github.com/spf13/cobra"
2828
)

‎commands/config/init.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package config
2020
import (
2121
"os"
2222

23-
"github.com/bcmi-labs/arduino-cli/commands"
24-
"github.com/bcmi-labs/arduino-cli/common/formatter"
23+
"github.com/arduino/arduino-cli/commands"
24+
"github.com/arduino/arduino-cli/common/formatter"
2525
"github.com/sirupsen/logrus"
2626
"github.com/spf13/cobra"
2727
)

‎commands/core/args.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"os"
2323
"strings"
2424

25-
"github.com/bcmi-labs/arduino-cli/arduino/cores/packagemanager"
26-
"github.com/bcmi-labs/arduino-cli/commands"
27-
"github.com/bcmi-labs/arduino-cli/common/formatter"
25+
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
26+
"github.com/arduino/arduino-cli/commands"
27+
"github.com/arduino/arduino-cli/common/formatter"
2828
"go.bug.st/relaxed-semver"
2929
)
3030

‎commands/core/core.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package core
1919

2020
import (
21-
"github.com/bcmi-labs/arduino-cli/commands"
21+
"github.com/arduino/arduino-cli/commands"
2222
"github.com/spf13/cobra"
2323
)
2424

0 commit comments

Comments
 (0)