Made 'version' package internal

cmaglie · cmaglie · commit 865216ed8876 · 2024-11-27T15:41:41.000+01:00
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -371,7 +371,7 @@ vars:
   TAG:
     sh: echo "$(git tag --points-at=HEAD 2> /dev/null | head -n1 | sed 's/^v//')"
   VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}{{.PACKAGE_NAME_PREFIX}}git-snapshot{{end}}"
-  CONFIGURATION_PACKAGE: "github.com/arduino/arduino-cli/version"
+  CONFIGURATION_PACKAGE: "github.com/arduino/arduino-cli/internal/version"
   LDFLAGS: >-
     -ldflags
     '
diff --git a/commands/internal/instances/instances.go b/commands/internal/instances/instances.go
@@ -22,8 +22,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	"github.com/arduino/go-paths-helper"
 	"go.bug.st/downloader/v2"
 )
diff --git a/commands/service.go b/commands/service.go
@@ -19,8 +19,8 @@ import (
 	"context"
 
 	"github.com/arduino/arduino-cli/internal/cli/configuration"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 )
 
 // NewArduinoCoreServer returns an implementation of the ArduinoCoreService gRPC service
diff --git a/commands/service_check_for_updates.go b/commands/service_check_for_updates.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/inventory"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	semver "go.bug.st/relaxed-semver"
 )
 
diff --git a/internal/arduino/monitor/monitor.go b/internal/arduino/monitor/monitor.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/arduino/arduino-cli/internal/i18n"
-	"github.com/arduino/arduino-cli/version"
+	"github.com/arduino/arduino-cli/internal/version"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 )
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -44,8 +44,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/cli/version"
 	"github.com/arduino/arduino-cli/internal/i18n"
 	"github.com/arduino/arduino-cli/internal/inventory"
+	versioninfo "github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	versioninfo "github.com/arduino/arduino-cli/version"
 	"github.com/fatih/color"
 	"github.com/mattn/go-colorable"
 	"github.com/rifflock/lfshook"
diff --git a/internal/cli/compile/compile.go b/internal/cli/compile/compile.go
@@ -31,8 +31,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/cli/feedback/table"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	"github.com/arduino/arduino-cli/internal/i18n"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	"github.com/arduino/go-paths-helper"
 	"github.com/fatih/color"
 	"github.com/sirupsen/logrus"
diff --git a/internal/cli/configuration/network.go b/internal/cli/configuration/network.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/arduino/arduino-cli/commands/cmderrors"
 	"github.com/arduino/arduino-cli/internal/i18n"
-	"github.com/arduino/arduino-cli/version"
+	"github.com/arduino/arduino-cli/internal/version"
 	"go.bug.st/downloader/v2"
 )
 
diff --git a/internal/cli/lib/install.go b/internal/cli/lib/install.go
@@ -26,8 +26,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	"github.com/arduino/arduino-cli/internal/i18n"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	"github.com/arduino/go-paths-helper"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/internal/cli/updater/updater.go b/internal/cli/updater/updater.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/i18n"
-	"github.com/arduino/arduino-cli/version"
+	"github.com/arduino/arduino-cli/internal/version"
 	"github.com/fatih/color"
 )
 
diff --git a/internal/cli/upload/upload.go b/internal/cli/upload/upload.go
@@ -29,8 +29,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	"github.com/arduino/arduino-cli/internal/i18n"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/internal/cli/version/version.go b/internal/cli/version/version.go
@@ -23,8 +23,8 @@ import (
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
 	"github.com/arduino/arduino-cli/internal/cli/updater"
 	"github.com/arduino/arduino-cli/internal/i18n"
+	"github.com/arduino/arduino-cli/internal/version"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
-	"github.com/arduino/arduino-cli/version"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/internal/version/version.go b/internal/version/version.go
diff --git a/internal/version/version_test.go b/internal/version/version_test.go

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ vars:`
`371`	`371`	`TAG:`
`372`	`372`	`sh: echo "$(git tag --points-at=HEAD 2> /dev/null \| head -n1 \| sed 's/^v//')"`
`373`	`373`	`VERSION: "{{if .NIGHTLY}}nightly-{{.TIMESTAMP_SHORT}}{{else if .TAG}}{{.TAG}}{{else}}{{.PACKAGE_NAME_PREFIX}}git-snapshot{{end}}"`
`374`		`- CONFIGURATION_PACKAGE: "github.com/arduino/arduino-cli/version"`
	`374`	`+ CONFIGURATION_PACKAGE: "github.com/arduino/arduino-cli/internal/version"`
`375`	`375`	`LDFLAGS: >-`
`376`	`376`	`-ldflags`
`377`	`377`	`'`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ import (`
`19`	`19`	`"context"`
`20`	`20`
`21`	`21`	`"github.com/arduino/arduino-cli/internal/cli/configuration"`
	`22`	`+ "github.com/arduino/arduino-cli/internal/version"`
`22`	`23`	`rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"`
`23`		`- "github.com/arduino/arduino-cli/version"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`// NewArduinoCoreServer returns an implementation of the ArduinoCoreService gRPC service`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ import (`
`22`	`22`
`23`	`23`	`"github.com/arduino/arduino-cli/internal/cli/feedback"`
`24`	`24`	`"github.com/arduino/arduino-cli/internal/inventory"`
	`25`	`+ "github.com/arduino/arduino-cli/internal/version"`
`25`	`26`	`rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"`
`26`		`- "github.com/arduino/arduino-cli/version"`
`27`	`27`	`semver "go.bug.st/relaxed-semver"`
`28`	`28`	`)`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"time"`
`29`	`29`
`30`	`30`	`"github.com/arduino/arduino-cli/internal/i18n"`
`31`		`- "github.com/arduino/arduino-cli/version"`
	`31`	`+ "github.com/arduino/arduino-cli/internal/version"`
`32`	`32`	`"github.com/arduino/go-paths-helper"`
`33`	`33`	`"github.com/sirupsen/logrus"`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"github.com/arduino/arduino-cli/commands/cmderrors"`
`27`	`27`	`"github.com/arduino/arduino-cli/internal/i18n"`
`28`		`- "github.com/arduino/arduino-cli/version"`
	`28`	`+ "github.com/arduino/arduino-cli/internal/version"`
`29`	`29`	`"go.bug.st/downloader/v2"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/arduino/arduino-cli/internal/cli/feedback"`
`22`	`22`	`"github.com/arduino/arduino-cli/internal/i18n"`
`23`		`- "github.com/arduino/arduino-cli/version"`
	`23`	`+ "github.com/arduino/arduino-cli/internal/version"`
`24`	`24`	`"github.com/fatih/color"`
`25`	`25`	`)`
`26`	`26`