Skip to content

Commit d5e359f

Browse files
committed
Move DefaultIndexURL under arduino/globals as it should be
1 parent 25e6df5 commit d5e359f

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

arduino/cores/packagemanager/profiles.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
"github.com/arduino/arduino-cli/arduino"
2323
"github.com/arduino/arduino-cli/arduino/cores"
24+
"github.com/arduino/arduino-cli/arduino/globals"
2425
"github.com/arduino/arduino-cli/arduino/resources"
2526
"github.com/arduino/arduino-cli/arduino/sketch"
26-
"github.com/arduino/arduino-cli/cli/globals"
2727
"github.com/arduino/arduino-cli/configuration"
2828
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2929
"github.com/arduino/go-paths-helper"

arduino/globals/globals.go

+3
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,7 @@ var (
5656
".hpp": empty,
5757
".hh": empty,
5858
}
59+
60+
// DefaultIndexURL is the default index url
61+
DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.tar.bz2"
5962
)

cli/core/search.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"strings"
2424
"time"
2525

26+
"github.com/arduino/arduino-cli/arduino/globals"
2627
"github.com/arduino/arduino-cli/arduino/utils"
2728
"github.com/arduino/arduino-cli/cli/errorcodes"
2829
"github.com/arduino/arduino-cli/cli/feedback"
29-
"github.com/arduino/arduino-cli/cli/globals"
3030
"github.com/arduino/arduino-cli/cli/instance"
3131
"github.com/arduino/arduino-cli/cli/output"
3232
"github.com/arduino/arduino-cli/commands"

cli/globals/globals.go

-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,4 @@ import (
2525
var (
2626
// VersionInfo contains all info injected during build
2727
VersionInfo = version.NewInfo(filepath.Base(os.Args[0]))
28-
// DefaultIndexURL is the default index url
29-
DefaultIndexURL = "https://downloads.arduino.cc/packages/package_index.tar.bz2"
3028
)

commands/instances.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ import (
2727
"github.com/arduino/arduino-cli/arduino/cores"
2828
"github.com/arduino/arduino-cli/arduino/cores/packageindex"
2929
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
30+
"github.com/arduino/arduino-cli/arduino/globals"
3031
"github.com/arduino/arduino-cli/arduino/httpclient"
3132
"github.com/arduino/arduino-cli/arduino/libraries"
3233
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
3334
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
3435
"github.com/arduino/arduino-cli/arduino/resources"
3536
"github.com/arduino/arduino-cli/arduino/sketch"
3637
"github.com/arduino/arduino-cli/arduino/utils"
37-
"github.com/arduino/arduino-cli/cli/globals"
38+
cliglobals "github.com/arduino/arduino-cli/cli/globals"
3839
"github.com/arduino/arduino-cli/configuration"
3940
"github.com/arduino/arduino-cli/i18n"
4041
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -128,7 +129,7 @@ func Create(req *rpc.CreateRequest, extraUserAgent ...string) (*rpc.CreateRespon
128129
}
129130

130131
// Create package manager
131-
userAgent := "arduino-cli/" + globals.VersionInfo.VersionString
132+
userAgent := "arduino-cli/" + cliglobals.VersionInfo.VersionString
132133
for _, ua := range extraUserAgent {
133134
userAgent += " " + ua
134135
}

docs/UPGRADING.md

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ The gRPC message structure `cc.arduino.cli.commands.v1.PlatformReference` has be
2424
It is currently used only in `cc.arduino.cli.commands.v1.CompileResponse`, so the field type has been changed as well.
2525
Old gRPC clients must only update gRPC bindings. They can safely ignore the new fields if not needed.
2626

27+
### golang API: `github.com/arduino/arduino-cli/cli/globals.DefaultIndexURL` has been moved under `github.com/arduino/arduino-cli/arduino/globals`
28+
29+
Legacy code should just update the import.
30+
2731
### golang API: PackageManager.DownloadPlatformRelease no longer need `label` parameter
2832

2933
```go

0 commit comments

Comments
 (0)