diff --git a/.github/workflows/check-go-task.yml b/.github/workflows/check-go-task.yml index 9e544fdead9..ac30e105afc 100644 --- a/.github/workflows/check-go-task.yml +++ b/.github/workflows/check-go-task.yml @@ -236,7 +236,7 @@ jobs: matrix: module: - path: internal/arduino/discovery/discovery_client - - path: client_example + - path: rpc/internal/client_example - path: commands/daemon/term_example steps: diff --git a/.github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml b/.github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml index f6207ae13ee..935939d3ddf 100644 --- a/.github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml +++ b/.github/workflows/deploy-cobra-mkdocs-versioned-poetry.yml @@ -21,7 +21,7 @@ on: - "go.sum" - "Taskfile.ya?ml" - "**.go" - - "docsgen/**" + - "internal/docsgen/**" - "rpc/**" - "mkdocs.ya?ml" - "poetry.lock" diff --git a/.gitignore b/.gitignore index 5c529f1a56b..435016fb119 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,9 @@ __debug_bin* .vscode # gRPC client example folder -/client_example/client_example -/client_example/**/*.bin -/client_example/**/*.elf +/rpc/internal/client_example/client_example +/rpc/internal/client_example/**/*.bin +/rpc/internal/client_example/**/*.elf # Misc. .DS_Store @@ -28,8 +28,8 @@ __debug_bin* # Mkdocs /site/ /public/ -/docsgen/arduino-cli -/docsgen/arduino-cli.exe +/internal/docsgen/arduino-cli +/internal/docsgen/arduino-cli.exe /docs/rpc/*.md /docs/commands/*.md /docs/configuration.schema.json diff --git a/Taskfile.yml b/Taskfile.yml index 0c80f449e21..c8f7db71ca3 100755 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -53,12 +53,12 @@ tasks: # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/deploy-cobra-mkdocs-versioned-poetry/Taskfile.yml go:cli-docs: desc: Generate command line interface reference documentation - dir: ./docsgen + dir: ./internal/docsgen cmds: # Command examples use os.Args[0] so the docs generation binary must have the same filename as the project - go build -o {{.PROJECT_NAME}}{{exeExt}} # The binary is invoked like this instead of `./{{.PROJECT_NAME}}` to remove the `./` chars from the examples - - PATH=. {{.PROJECT_NAME}} ../docs/commands + - PATH=. {{.PROJECT_NAME}} ../../docs/commands # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-go-task/Taskfile.yml go:fix: @@ -301,24 +301,24 @@ tasks: i18n:update: desc: Updates i18n files cmds: - - go run ./i18n/cmd/main.go catalog generate . > ./i18n/data/en.po + - go run ./internal/i18n/cmd/main.go catalog generate . > ./internal/i18n/data/en.po i18n:pull: desc: Pull i18n files from transifex cmds: - - go run ./i18n/cmd/main.go transifex pull ./i18n/data + - go run ./internal/i18n/cmd/main.go transifex pull ./internal/i18n/data i18n:push: desc: Push i18n files to transifex cmds: - - go run ./i18n/cmd/main.go transifex push ./i18n/data + - go run ./internal/i18n/cmd/main.go transifex push ./internal/i18n/data i18n:check: desc: Check if the i18n message catalog was updated cmds: - task: i18n:pull - - git add -N ./i18n/data - - git diff --exit-code ./i18n/data + - git add -N ./internal/i18n/data + - git diff --exit-code ./internal/i18n/data # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-mkdocs-task/Taskfile.yml website:check: diff --git a/commands/board/board.go b/commands/board/board.go index f4da2ff6ae4..3baebc26d27 100644 --- a/commands/board/board.go +++ b/commands/board/board.go @@ -15,6 +15,6 @@ package board -import "github.com/arduino/arduino-cli/i18n" +import "github.com/arduino/arduino-cli/internal/i18n" var tr = i18n.Tr diff --git a/commands/cmderrors/cmderrors.go b/commands/cmderrors/cmderrors.go index d5b0c93bf34..248b785df0e 100644 --- a/commands/cmderrors/cmderrors.go +++ b/commands/cmderrors/cmderrors.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "google.golang.org/grpc/codes" diff --git a/commands/compile/compile.go b/commands/compile/compile.go index 8e4d4af3547..92382b3e939 100644 --- a/commands/compile/compile.go +++ b/commands/compile/compile.go @@ -25,7 +25,6 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/builder" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" @@ -33,6 +32,7 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/arduino-cli/internal/buildcache" "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/arduino-cli/internal/inventory" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" diff --git a/commands/core/download.go b/commands/core/download.go index 2d67157d31e..c166af6585a 100644 --- a/commands/core/download.go +++ b/commands/core/download.go @@ -21,8 +21,8 @@ import ( "github.com/arduino/arduino-cli/commands" "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" ) diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go index ffb7e0c0f5d..be212073eeb 100644 --- a/commands/daemon/daemon.go +++ b/commands/daemon/daemon.go @@ -30,7 +30,7 @@ import ( "github.com/arduino/arduino-cli/commands/monitor" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" diff --git a/commands/debug/debug.go b/commands/debug/debug.go index 76282515e5e..afecc276439 100644 --- a/commands/debug/debug.go +++ b/commands/debug/debug.go @@ -26,8 +26,8 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/instances.go b/commands/instances.go index aaeb32d8195..a4a70d19370 100644 --- a/commands/instances.go +++ b/commands/instances.go @@ -24,7 +24,6 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" @@ -36,6 +35,7 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/sketch" "github.com/arduino/arduino-cli/internal/arduino/utils" "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/commands/lib/download.go b/commands/lib/download.go index 47022c3ee56..a8714413eb3 100644 --- a/commands/lib/download.go +++ b/commands/lib/download.go @@ -20,10 +20,10 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" ) diff --git a/commands/monitor/monitor.go b/commands/monitor/monitor.go index f6285ec77bd..31c30c2e34d 100644 --- a/commands/monitor/monitor.go +++ b/commands/monitor/monitor.go @@ -22,10 +22,10 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" pluggableMonitor "github.com/arduino/arduino-cli/internal/arduino/monitor" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-properties-orderedmap" "github.com/sirupsen/logrus" diff --git a/commands/sketch/archive.go b/commands/sketch/archive.go index 7d07d1fcbf2..8f843dbca6b 100644 --- a/commands/sketch/archive.go +++ b/commands/sketch/archive.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/arduino/arduino-cli/commands/cmderrors" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" ) diff --git a/commands/upload/upload.go b/commands/upload/upload.go index 7a8c08bf6ee..0d1e257a09e 100644 --- a/commands/upload/upload.go +++ b/commands/upload/upload.go @@ -26,7 +26,6 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/internal/instances" - "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager" @@ -34,6 +33,7 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/arduino/serialutils" "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index bb787d7248e..5f46b42f90a 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -10,8 +10,11 @@ The following golang modules are no longer available as public API: - `github.com/arduino/arduino-cli/arduino` - `github.com/arduino/arduino-cli/buildcache` +- `github.com/arduino/arduino-cli/client_example` - `github.com/arduino/arduino-cli/configuration` +- `github.com/arduino/arduino-cli/docsgen` - `github.com/arduino/arduino-cli/executils` +- `github.com/arduino/arduino-cli/i18n` - `github.com/arduino/arduino-cli/table` Most of the `executils` library has been integrated inside the `go-paths` library `github.com/arduino/go-paths-helper`. diff --git a/docs/getting-started.md b/docs/getting-started.md index 19628282f91..ad4de630496 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -349,6 +349,6 @@ metrics: ``` [configuration documentation]: configuration.md -[client_example]: https://github.com/arduino/arduino-cli/blob/master/client_example +[client_example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example [grpc reference]: rpc/commands.md [prometheus]: https://prometheus.io/ diff --git a/docs/index.md b/docs/index.md index 1e85317f7a6..2819e36b837 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,5 +19,5 @@ services and messages are detailed in the [gRPC reference] pages. [installation]: installation.md [getting started guide]: getting-started.md -[client_example]: https://github.com/arduino/arduino-cli/blob/master/client_example +[client_example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example [grpc reference]: rpc/commands.md diff --git a/docs/integration-options.md b/docs/integration-options.md index 90b9b849159..ca1cc381134 100644 --- a/docs/integration-options.md +++ b/docs/integration-options.md @@ -102,7 +102,7 @@ tracker] if you’ve got a use case that doesn’t fit one of the three pillars. [grpc interface reference]: rpc/commands.md [grpc supported languages]: https://grpc.io/docs/languages/ [arduino cli repository]: https://github.com/arduino/arduino-cli -[grpc client example]: https://github.com/arduino/arduino-cli/blob/master/client_example +[grpc client example]: https://github.com/arduino/arduino-cli/blob/master/rpc/internal/client_example [commands package]: https://github.com/arduino/arduino-cli/tree/master/commands [issue tracker]: https://github.com/arduino/arduino-cli/issues [contextual help screenshot]: img/CLI_contextual_help_screenshot.png diff --git a/internal/arduino/builder/internal/compilation/database.go b/internal/arduino/builder/internal/compilation/database.go index fb21f7ba5dc..73441bc07bc 100644 --- a/internal/arduino/builder/internal/compilation/database.go +++ b/internal/arduino/builder/internal/compilation/database.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" ) diff --git a/internal/arduino/builder/internal/detector/detector.go b/internal/arduino/builder/internal/detector/detector.go index e368edd13b3..a8cf2d3c077 100644 --- a/internal/arduino/builder/internal/detector/detector.go +++ b/internal/arduino/builder/internal/detector/detector.go @@ -26,7 +26,6 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/builder/internal/logger" "github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor" "github.com/arduino/arduino-cli/internal/arduino/builder/internal/utils" @@ -36,6 +35,7 @@ import ( "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesresolver" "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" ) diff --git a/internal/arduino/builder/internal/preprocessor/ctags.go b/internal/arduino/builder/internal/preprocessor/ctags.go index c3c8d150f46..53990492169 100644 --- a/internal/arduino/builder/internal/preprocessor/ctags.go +++ b/internal/arduino/builder/internal/preprocessor/ctags.go @@ -25,10 +25,10 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" "github.com/arduino/arduino-cli/internal/arduino/builder/internal/preprocessor/internal/ctags" "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" "github.com/arduino/go-properties-orderedmap" ) diff --git a/internal/arduino/builder/sketch.go b/internal/arduino/builder/sketch.go index 9331d93f341..7f058dc7d38 100644 --- a/internal/arduino/builder/sketch.go +++ b/internal/arduino/builder/sketch.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" "github.com/arduino/arduino-cli/internal/arduino/builder/cpp" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" "github.com/marcinbor85/gohex" ) diff --git a/internal/arduino/cores/cores.go b/internal/arduino/cores/cores.go index a9c4cc40bd6..3f6f15a2741 100644 --- a/internal/arduino/cores/cores.go +++ b/internal/arduino/cores/cores.go @@ -25,10 +25,10 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/globals" "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/arduino/arduino-cli/internal/arduino/utils" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/internal/arduino/cores/packageindex/index.go b/internal/arduino/cores/packageindex/index.go index 49930e3dedd..6cde8d1e90f 100644 --- a/internal/arduino/cores/packageindex/index.go +++ b/internal/arduino/cores/packageindex/index.go @@ -19,10 +19,10 @@ import ( "encoding/json" "fmt" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/resources" "github.com/arduino/arduino-cli/internal/arduino/security" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" easyjson "github.com/mailru/easyjson" "github.com/sirupsen/logrus" diff --git a/internal/arduino/cores/packagemanager/package_manager.go b/internal/arduino/cores/packagemanager/package_manager.go index 4daf8984f30..04d0e846f81 100644 --- a/internal/arduino/cores/packagemanager/package_manager.go +++ b/internal/arduino/cores/packagemanager/package_manager.go @@ -28,11 +28,11 @@ import ( "time" "github.com/arduino/arduino-cli/commands/cmderrors" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/cores/packageindex" "github.com/arduino/arduino-cli/internal/arduino/discovery/discoverymanager" "github.com/arduino/arduino-cli/internal/arduino/sketch" + "github.com/arduino/arduino-cli/internal/i18n" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" "github.com/arduino/go-timeutils" diff --git a/internal/arduino/discovery/discovery.go b/internal/arduino/discovery/discovery.go index a1b719db3ee..bc62456e3e0 100644 --- a/internal/arduino/discovery/discovery.go +++ b/internal/arduino/discovery/discovery.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" "github.com/arduino/go-paths-helper" diff --git a/internal/arduino/discovery/discoverymanager/discoverymanager.go b/internal/arduino/discovery/discoverymanager/discoverymanager.go index 32596a39ffa..c1a5f55bd46 100644 --- a/internal/arduino/discovery/discoverymanager/discoverymanager.go +++ b/internal/arduino/discovery/discoverymanager/discoverymanager.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/discovery" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" ) diff --git a/internal/arduino/httpclient/httpclient.go b/internal/arduino/httpclient/httpclient.go index d6bea3d045f..ec4b4acc4a6 100644 --- a/internal/arduino/httpclient/httpclient.go +++ b/internal/arduino/httpclient/httpclient.go @@ -21,8 +21,8 @@ import ( "time" "github.com/arduino/arduino-cli/commands/cmderrors" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/internal/arduino/libraries/libraries.go b/internal/arduino/libraries/libraries.go index a6e566a11bd..941627393f2 100644 --- a/internal/arduino/libraries/libraries.go +++ b/internal/arduino/libraries/libraries.go @@ -18,9 +18,9 @@ package libraries import ( "fmt" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" paths "github.com/arduino/go-paths-helper" properties "github.com/arduino/go-properties-orderedmap" diff --git a/internal/arduino/libraries/librariesindex/json.go b/internal/arduino/libraries/librariesindex/json.go index 85c450fde32..1db3db84d81 100644 --- a/internal/arduino/libraries/librariesindex/json.go +++ b/internal/arduino/libraries/librariesindex/json.go @@ -18,8 +18,8 @@ package librariesindex import ( "fmt" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/resources" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" easyjson "github.com/mailru/easyjson" semver "go.bug.st/relaxed-semver" diff --git a/internal/arduino/libraries/librariesmanager/librariesmanager.go b/internal/arduino/libraries/librariesmanager/librariesmanager.go index cedc20d9d7b..a73a6025c72 100644 --- a/internal/arduino/libraries/librariesmanager/librariesmanager.go +++ b/internal/arduino/libraries/librariesmanager/librariesmanager.go @@ -22,10 +22,10 @@ import ( "slices" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesindex" + "github.com/arduino/arduino-cli/internal/i18n" paths "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" "google.golang.org/grpc/codes" diff --git a/internal/arduino/libraries/librariesresolver/cpp.go b/internal/arduino/libraries/librariesresolver/cpp.go index 6224c6ffd52..deee71545d3 100644 --- a/internal/arduino/libraries/librariesresolver/cpp.go +++ b/internal/arduino/libraries/librariesresolver/cpp.go @@ -20,11 +20,11 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/cores" "github.com/arduino/arduino-cli/internal/arduino/libraries" "github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager" "github.com/arduino/arduino-cli/internal/arduino/utils" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/schollz/closestmatch" "github.com/sirupsen/logrus" ) diff --git a/internal/arduino/monitor/monitor.go b/internal/arduino/monitor/monitor.go index 8e0f8f40c3f..c2dc81669fa 100644 --- a/internal/arduino/monitor/monitor.go +++ b/internal/arduino/monitor/monitor.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/arduino-cli/version" "github.com/arduino/go-paths-helper" "github.com/sirupsen/logrus" diff --git a/internal/arduino/resources/checksums.go b/internal/arduino/resources/checksums.go index cadd3ea6685..25ec3a6996b 100644 --- a/internal/arduino/resources/checksums.go +++ b/internal/arduino/resources/checksums.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" paths "github.com/arduino/go-paths-helper" ) diff --git a/internal/arduino/security/signatures.go b/internal/arduino/security/signatures.go index dfe9b959814..f6e6315c8f8 100644 --- a/internal/arduino/security/signatures.go +++ b/internal/arduino/security/signatures.go @@ -22,7 +22,7 @@ import ( "os" "github.com/ProtonMail/go-crypto/openpgp" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" ) diff --git a/internal/arduino/serialutils/serialutils.go b/internal/arduino/serialutils/serialutils.go index c3d5f8521e3..d99a29ef83a 100644 --- a/internal/arduino/serialutils/serialutils.go +++ b/internal/arduino/serialutils/serialutils.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "go.bug.st/serial" ) diff --git a/internal/arduino/sketch/sketch.go b/internal/arduino/sketch/sketch.go index 046f96c4623..f0f51680f72 100644 --- a/internal/arduino/sketch/sketch.go +++ b/internal/arduino/sketch/sketch.go @@ -23,8 +23,8 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/globals" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/go-paths-helper" ) diff --git a/internal/cli/arguments/arguments.go b/internal/cli/arguments/arguments.go index e3aa6a8dded..ef8a1596d8f 100644 --- a/internal/cli/arguments/arguments.go +++ b/internal/cli/arguments/arguments.go @@ -18,8 +18,8 @@ package arguments import ( "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/board/board.go b/internal/cli/board/board.go index 762d502f645..8cdba86743c 100644 --- a/internal/cli/board/board.go +++ b/internal/cli/board/board.go @@ -18,7 +18,7 @@ package board import ( "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/burnbootloader/burnbootloader.go b/internal/cli/burnbootloader/burnbootloader.go index 8b6c0fc772b..c14c63eeb42 100644 --- a/internal/cli/burnbootloader/burnbootloader.go +++ b/internal/cli/burnbootloader/burnbootloader.go @@ -22,10 +22,10 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/upload" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/instance" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/cache/cache.go b/internal/cli/cache/cache.go index 1d8394f03bc..43c9d775234 100644 --- a/internal/cli/cache/cache.go +++ b/internal/cli/cache/cache.go @@ -18,7 +18,7 @@ package cache import ( "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 024847ff273..d08a45e2e80 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -21,7 +21,6 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/board" "github.com/arduino/arduino-cli/internal/cli/burnbootloader" "github.com/arduino/arduino-cli/internal/cli/cache" @@ -43,6 +42,7 @@ import ( "github.com/arduino/arduino-cli/internal/cli/upgrade" "github.com/arduino/arduino-cli/internal/cli/upload" "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/version" "github.com/fatih/color" diff --git a/internal/cli/compile/compile.go b/internal/cli/compile/compile.go index bf40b125007..3d2f5b84f72 100644 --- a/internal/cli/compile/compile.go +++ b/internal/cli/compile/compile.go @@ -29,13 +29,13 @@ import ( "github.com/arduino/arduino-cli/commands/core" "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" "github.com/arduino/arduino-cli/internal/cli/instance" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" "github.com/arduino/go-paths-helper" diff --git a/internal/cli/completion/completion.go b/internal/cli/completion/completion.go index 0dd05f8e315..d4036d393aa 100644 --- a/internal/cli/completion/completion.go +++ b/internal/cli/completion/completion.go @@ -18,8 +18,8 @@ package completion import ( "os" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/cli/config/config.go b/internal/cli/config/config.go index 9d03c64b7e6..38666248f91 100644 --- a/internal/cli/config/config.go +++ b/internal/cli/config/config.go @@ -19,8 +19,8 @@ import ( "os" "reflect" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/configuration" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/configuration/configuration.go b/internal/cli/configuration/configuration.go index 22a7d9049bc..858390894bc 100644 --- a/internal/cli/configuration/configuration.go +++ b/internal/cli/configuration/configuration.go @@ -21,8 +21,8 @@ import ( "runtime" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" paths "github.com/arduino/go-paths-helper" "github.com/arduino/go-win32-utils" "github.com/spf13/cobra" diff --git a/internal/cli/core/core.go b/internal/cli/core/core.go index f040d3e2efc..3792ad13227 100644 --- a/internal/cli/core/core.go +++ b/internal/cli/core/core.go @@ -18,7 +18,7 @@ package core import ( "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/daemon/daemon.go b/internal/cli/daemon/daemon.go index 2331e8005ca..fcda04024f4 100644 --- a/internal/cli/daemon/daemon.go +++ b/internal/cli/daemon/daemon.go @@ -25,9 +25,9 @@ import ( "syscall" "github.com/arduino/arduino-cli/commands/daemon" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" srv_commands "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" "github.com/arduino/go-paths-helper" diff --git a/internal/cli/debug/debug.go b/internal/cli/debug/debug.go index fcf72fd1686..390d1b1321c 100644 --- a/internal/cli/debug/debug.go +++ b/internal/cli/debug/debug.go @@ -25,11 +25,11 @@ import ( "github.com/arduino/arduino-cli/commands/cmderrors" "github.com/arduino/arduino-cli/commands/debug" "github.com/arduino/arduino-cli/commands/sketch" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/table" "github.com/arduino/arduino-cli/internal/cli/instance" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/fatih/color" "github.com/sirupsen/logrus" diff --git a/internal/cli/feedback/feedback.go b/internal/cli/feedback/feedback.go index 0beb6c0c10c..04b5ba336c1 100644 --- a/internal/cli/feedback/feedback.go +++ b/internal/cli/feedback/feedback.go @@ -24,7 +24,7 @@ import ( "io" "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" "sigs.k8s.io/yaml" ) diff --git a/internal/cli/feedback/result/rpc.go b/internal/cli/feedback/result/rpc.go index a78a2d95875..a96ccbb02c6 100644 --- a/internal/cli/feedback/result/rpc.go +++ b/internal/cli/feedback/result/rpc.go @@ -20,8 +20,8 @@ import ( "fmt" "slices" - "github.com/arduino/arduino-cli/i18n" f "github.com/arduino/arduino-cli/internal/algorithms" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/arduino-cli/internal/orderedmap" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" semver "go.bug.st/relaxed-semver" diff --git a/internal/cli/generatedocs/generatedocs.go b/internal/cli/generatedocs/generatedocs.go index 0be07a768cb..59bf270c442 100644 --- a/internal/cli/generatedocs/generatedocs.go +++ b/internal/cli/generatedocs/generatedocs.go @@ -19,8 +19,8 @@ import ( "os" "path/filepath" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" diff --git a/internal/cli/instance/instance.go b/internal/cli/instance/instance.go index 0cd9e8ceb85..6a3df6aed9f 100644 --- a/internal/cli/instance/instance.go +++ b/internal/cli/instance/instance.go @@ -17,8 +17,8 @@ package instance import ( "github.com/arduino/arduino-cli/commands" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/go-paths-helper" ) diff --git a/internal/cli/lib/lib.go b/internal/cli/lib/lib.go index c6cdbb59b58..edba456bde9 100644 --- a/internal/cli/lib/lib.go +++ b/internal/cli/lib/lib.go @@ -18,7 +18,7 @@ package lib import ( "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/monitor/monitor.go b/internal/cli/monitor/monitor.go index 44dca503715..ea6018fa2df 100644 --- a/internal/cli/monitor/monitor.go +++ b/internal/cli/monitor/monitor.go @@ -28,12 +28,12 @@ import ( "github.com/arduino/arduino-cli/commands/monitor" sk "github.com/arduino/arduino-cli/commands/sketch" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" "github.com/arduino/arduino-cli/internal/cli/instance" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/fatih/color" "github.com/sirupsen/logrus" diff --git a/internal/cli/outdated/outdated.go b/internal/cli/outdated/outdated.go index f571b197371..4859f6159fc 100644 --- a/internal/cli/outdated/outdated.go +++ b/internal/cli/outdated/outdated.go @@ -21,13 +21,13 @@ import ( "sort" "strings" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/core" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/feedback/table" "github.com/arduino/arduino-cli/internal/cli/instance" "github.com/arduino/arduino-cli/internal/cli/lib" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/internal/cli/sketch/sketch.go b/internal/cli/sketch/sketch.go index fa172d3148e..5d8da390eed 100644 --- a/internal/cli/sketch/sketch.go +++ b/internal/cli/sketch/sketch.go @@ -18,7 +18,7 @@ package sketch import ( "os" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/spf13/cobra" ) diff --git a/internal/cli/update/update.go b/internal/cli/update/update.go index 693daae6244..d516a5cc701 100644 --- a/internal/cli/update/update.go +++ b/internal/cli/update/update.go @@ -18,11 +18,11 @@ package update import ( "os" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/core" "github.com/arduino/arduino-cli/internal/cli/instance" "github.com/arduino/arduino-cli/internal/cli/lib" "github.com/arduino/arduino-cli/internal/cli/outdated" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/cli/updater/updater.go b/internal/cli/updater/updater.go index 8b8a54a0f85..8a980fb3ad9 100644 --- a/internal/cli/updater/updater.go +++ b/internal/cli/updater/updater.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/arduino/httpclient" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/arduino/arduino-cli/internal/inventory" "github.com/arduino/arduino-cli/version" "github.com/fatih/color" diff --git a/internal/cli/upgrade/upgrade.go b/internal/cli/upgrade/upgrade.go index 937abd845fa..cf1f71448e7 100644 --- a/internal/cli/upgrade/upgrade.go +++ b/internal/cli/upgrade/upgrade.go @@ -18,11 +18,11 @@ package upgrade import ( "os" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/core" "github.com/arduino/arduino-cli/internal/cli/instance" "github.com/arduino/arduino-cli/internal/cli/lib" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/cli/upload/upload.go b/internal/cli/upload/upload.go index 2f480e62ca2..7052b91d34a 100644 --- a/internal/cli/upload/upload.go +++ b/internal/cli/upload/upload.go @@ -26,11 +26,11 @@ import ( "github.com/arduino/arduino-cli/commands/core" sk "github.com/arduino/arduino-cli/commands/sketch" "github.com/arduino/arduino-cli/commands/upload" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli/arguments" "github.com/arduino/arduino-cli/internal/cli/feedback" "github.com/arduino/arduino-cli/internal/cli/feedback/result" "github.com/arduino/arduino-cli/internal/cli/instance" + "github.com/arduino/arduino-cli/internal/i18n" rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1" "github.com/arduino/arduino-cli/version" "github.com/sirupsen/logrus" diff --git a/internal/cli/usage.go b/internal/cli/usage.go index 0858fd7fffd..7b2e7ef113a 100644 --- a/internal/cli/usage.go +++ b/internal/cli/usage.go @@ -16,7 +16,7 @@ package cli import ( - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" ) var tr = i18n.Tr diff --git a/internal/cli/version/version.go b/internal/cli/version/version.go index e445d751fc8..990a4cbd236 100644 --- a/internal/cli/version/version.go +++ b/internal/cli/version/version.go @@ -20,9 +20,9 @@ import ( "os" "strings" - "github.com/arduino/arduino-cli/i18n" "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/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/docsgen/main.go b/internal/docsgen/main.go similarity index 100% rename from docsgen/main.go rename to internal/docsgen/main.go diff --git a/i18n/README.md b/internal/i18n/README.md similarity index 100% rename from i18n/README.md rename to internal/i18n/README.md diff --git a/i18n/cmd/ast/parser.go b/internal/i18n/cmd/ast/parser.go similarity index 97% rename from i18n/cmd/ast/parser.go rename to internal/i18n/cmd/ast/parser.go index 9126a4ada8e..d8d558cd975 100644 --- a/i18n/cmd/ast/parser.go +++ b/internal/i18n/cmd/ast/parser.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/arduino/arduino-cli/i18n/cmd/po" + "github.com/arduino/arduino-cli/internal/i18n/cmd/po" ) // GenerateCatalog generates the i18n message catalog for the go source files diff --git a/i18n/cmd/commands/catalog/catalog.go b/internal/i18n/cmd/commands/catalog/catalog.go similarity index 100% rename from i18n/cmd/commands/catalog/catalog.go rename to internal/i18n/cmd/commands/catalog/catalog.go diff --git a/i18n/cmd/commands/catalog/generate_catalog.go b/internal/i18n/cmd/commands/catalog/generate_catalog.go similarity index 96% rename from i18n/cmd/commands/catalog/generate_catalog.go rename to internal/i18n/cmd/commands/catalog/generate_catalog.go index c895660867a..1c65c640ffc 100644 --- a/i18n/cmd/commands/catalog/generate_catalog.go +++ b/internal/i18n/cmd/commands/catalog/generate_catalog.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/arduino/arduino-cli/i18n/cmd/ast" + "github.com/arduino/arduino-cli/internal/i18n/cmd/ast" "github.com/spf13/cobra" ) diff --git a/i18n/cmd/commands/root.go b/internal/i18n/cmd/commands/root.go similarity index 88% rename from i18n/cmd/commands/root.go rename to internal/i18n/cmd/commands/root.go index e05403669c0..14559dcfee9 100644 --- a/i18n/cmd/commands/root.go +++ b/internal/i18n/cmd/commands/root.go @@ -16,8 +16,8 @@ package commands import ( - "github.com/arduino/arduino-cli/i18n/cmd/commands/catalog" - "github.com/arduino/arduino-cli/i18n/cmd/commands/transifex" + "github.com/arduino/arduino-cli/internal/i18n/cmd/commands/catalog" + "github.com/arduino/arduino-cli/internal/i18n/cmd/commands/transifex" "github.com/spf13/cobra" ) diff --git a/i18n/cmd/commands/transifex/pull_transifex.go b/internal/i18n/cmd/commands/transifex/pull_transifex.go similarity index 100% rename from i18n/cmd/commands/transifex/pull_transifex.go rename to internal/i18n/cmd/commands/transifex/pull_transifex.go diff --git a/i18n/cmd/commands/transifex/push_transifex.go b/internal/i18n/cmd/commands/transifex/push_transifex.go similarity index 100% rename from i18n/cmd/commands/transifex/push_transifex.go rename to internal/i18n/cmd/commands/transifex/push_transifex.go diff --git a/i18n/cmd/commands/transifex/transifex.go b/internal/i18n/cmd/commands/transifex/transifex.go similarity index 100% rename from i18n/cmd/commands/transifex/transifex.go rename to internal/i18n/cmd/commands/transifex/transifex.go diff --git a/i18n/cmd/main.go b/internal/i18n/cmd/main.go similarity index 93% rename from i18n/cmd/main.go rename to internal/i18n/cmd/main.go index 69b1373251e..8752c9d668e 100644 --- a/i18n/cmd/main.go +++ b/internal/i18n/cmd/main.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/arduino/arduino-cli/i18n/cmd/commands" + "github.com/arduino/arduino-cli/internal/i18n/cmd/commands" ) func main() { diff --git a/i18n/cmd/po/catalog.go b/internal/i18n/cmd/po/catalog.go similarity index 100% rename from i18n/cmd/po/catalog.go rename to internal/i18n/cmd/po/catalog.go diff --git a/i18n/cmd/po/catalog_test.go b/internal/i18n/cmd/po/catalog_test.go similarity index 100% rename from i18n/cmd/po/catalog_test.go rename to internal/i18n/cmd/po/catalog_test.go diff --git a/i18n/cmd/po/merge.go b/internal/i18n/cmd/po/merge.go similarity index 100% rename from i18n/cmd/po/merge.go rename to internal/i18n/cmd/po/merge.go diff --git a/i18n/cmd/po/merge_test.go b/internal/i18n/cmd/po/merge_test.go similarity index 100% rename from i18n/cmd/po/merge_test.go rename to internal/i18n/cmd/po/merge_test.go diff --git a/i18n/cmd/po/parser.go b/internal/i18n/cmd/po/parser.go similarity index 100% rename from i18n/cmd/po/parser.go rename to internal/i18n/cmd/po/parser.go diff --git a/i18n/cmd/po/parser_test.go b/internal/i18n/cmd/po/parser_test.go similarity index 100% rename from i18n/cmd/po/parser_test.go rename to internal/i18n/cmd/po/parser_test.go diff --git a/i18n/convert.go b/internal/i18n/convert.go similarity index 100% rename from i18n/convert.go rename to internal/i18n/convert.go diff --git a/i18n/convert_test.go b/internal/i18n/convert_test.go similarity index 100% rename from i18n/convert_test.go rename to internal/i18n/convert_test.go diff --git a/i18n/data/.gitkeep b/internal/i18n/data/.gitkeep similarity index 100% rename from i18n/data/.gitkeep rename to internal/i18n/data/.gitkeep diff --git a/i18n/data/README.md b/internal/i18n/data/README.md similarity index 89% rename from i18n/data/README.md rename to internal/i18n/data/README.md index e795dcd7735..d52ec1782ae 100644 --- a/i18n/data/README.md +++ b/internal/i18n/data/README.md @@ -7,6 +7,6 @@ at the source: - **en.po** - edit the string in the source code file indicated by the comment above it
e.g., a comment `#: commands/upload/upload.go:615` indicates the source string is at line 615 of the file - [`commands/upload/upload.go`](../../commands/upload/upload.go) + [`commands/upload/upload.go`](../../../commands/upload/upload.go) - **All other files** - the localization is done on **Transifex**:
https://explore.transifex.com/arduino-1/arduino-cli/ diff --git a/i18n/data/ar.po b/internal/i18n/data/ar.po similarity index 100% rename from i18n/data/ar.po rename to internal/i18n/data/ar.po diff --git a/i18n/data/de.po b/internal/i18n/data/de.po similarity index 100% rename from i18n/data/de.po rename to internal/i18n/data/de.po diff --git a/i18n/data/en.po b/internal/i18n/data/en.po similarity index 100% rename from i18n/data/en.po rename to internal/i18n/data/en.po diff --git a/i18n/data/es.po b/internal/i18n/data/es.po similarity index 100% rename from i18n/data/es.po rename to internal/i18n/data/es.po diff --git a/i18n/data/fr.po b/internal/i18n/data/fr.po similarity index 100% rename from i18n/data/fr.po rename to internal/i18n/data/fr.po diff --git a/i18n/data/he.po b/internal/i18n/data/he.po similarity index 100% rename from i18n/data/he.po rename to internal/i18n/data/he.po diff --git a/i18n/data/it_IT.po b/internal/i18n/data/it_IT.po similarity index 100% rename from i18n/data/it_IT.po rename to internal/i18n/data/it_IT.po diff --git a/i18n/data/ja.po b/internal/i18n/data/ja.po similarity index 100% rename from i18n/data/ja.po rename to internal/i18n/data/ja.po diff --git a/i18n/data/kk.po b/internal/i18n/data/kk.po similarity index 100% rename from i18n/data/kk.po rename to internal/i18n/data/kk.po diff --git a/i18n/data/ko.po b/internal/i18n/data/ko.po similarity index 100% rename from i18n/data/ko.po rename to internal/i18n/data/ko.po diff --git a/i18n/data/lb.po b/internal/i18n/data/lb.po similarity index 100% rename from i18n/data/lb.po rename to internal/i18n/data/lb.po diff --git a/i18n/data/mn.po b/internal/i18n/data/mn.po similarity index 100% rename from i18n/data/mn.po rename to internal/i18n/data/mn.po diff --git a/i18n/data/my_MM.po b/internal/i18n/data/my_MM.po similarity index 100% rename from i18n/data/my_MM.po rename to internal/i18n/data/my_MM.po diff --git a/i18n/data/ne.po b/internal/i18n/data/ne.po similarity index 100% rename from i18n/data/ne.po rename to internal/i18n/data/ne.po diff --git a/i18n/data/pl.po b/internal/i18n/data/pl.po similarity index 100% rename from i18n/data/pl.po rename to internal/i18n/data/pl.po diff --git a/i18n/data/pt.po b/internal/i18n/data/pt.po similarity index 100% rename from i18n/data/pt.po rename to internal/i18n/data/pt.po diff --git a/i18n/data/pt_BR.po b/internal/i18n/data/pt_BR.po similarity index 100% rename from i18n/data/pt_BR.po rename to internal/i18n/data/pt_BR.po diff --git a/i18n/data/ru.po b/internal/i18n/data/ru.po similarity index 100% rename from i18n/data/ru.po rename to internal/i18n/data/ru.po diff --git a/i18n/data/zh.po b/internal/i18n/data/zh.po similarity index 100% rename from i18n/data/zh.po rename to internal/i18n/data/zh.po diff --git a/i18n/data/zh_TW.po b/internal/i18n/data/zh_TW.po similarity index 100% rename from i18n/data/zh_TW.po rename to internal/i18n/data/zh_TW.po diff --git a/i18n/detect.go b/internal/i18n/detect.go similarity index 100% rename from i18n/detect.go rename to internal/i18n/detect.go diff --git a/i18n/detect_cgo_darwin.go b/internal/i18n/detect_cgo_darwin.go similarity index 100% rename from i18n/detect_cgo_darwin.go rename to internal/i18n/detect_cgo_darwin.go diff --git a/i18n/detect_freebsd.go b/internal/i18n/detect_freebsd.go similarity index 100% rename from i18n/detect_freebsd.go rename to internal/i18n/detect_freebsd.go diff --git a/i18n/detect_linux.go b/internal/i18n/detect_linux.go similarity index 100% rename from i18n/detect_linux.go rename to internal/i18n/detect_linux.go diff --git a/i18n/detect_nocgo_darwin.go b/internal/i18n/detect_nocgo_darwin.go similarity index 100% rename from i18n/detect_nocgo_darwin.go rename to internal/i18n/detect_nocgo_darwin.go diff --git a/i18n/detect_windows.go b/internal/i18n/detect_windows.go similarity index 100% rename from i18n/detect_windows.go rename to internal/i18n/detect_windows.go diff --git a/i18n/i18n.go b/internal/i18n/i18n.go similarity index 100% rename from i18n/i18n.go rename to internal/i18n/i18n.go diff --git a/i18n/i18n_test.go b/internal/i18n/i18n_test.go similarity index 100% rename from i18n/i18n_test.go rename to internal/i18n/i18n_test.go diff --git a/i18n/locale.go b/internal/i18n/locale.go similarity index 100% rename from i18n/locale.go rename to internal/i18n/locale.go diff --git a/i18n/locale_test.go b/internal/i18n/locale_test.go similarity index 100% rename from i18n/locale_test.go rename to internal/i18n/locale_test.go diff --git a/internal/inventory/inventory.go b/internal/inventory/inventory.go index 05b8f1ea24b..3155fb4b9db 100644 --- a/internal/inventory/inventory.go +++ b/internal/inventory/inventory.go @@ -21,7 +21,7 @@ import ( "path/filepath" "sync" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" "github.com/gofrs/uuid/v5" "github.com/sirupsen/logrus" "github.com/spf13/viper" diff --git a/main.go b/main.go index 677dfd7bdf8..751e81a32cc 100644 --- a/main.go +++ b/main.go @@ -18,10 +18,10 @@ package main import ( "os" - "github.com/arduino/arduino-cli/i18n" "github.com/arduino/arduino-cli/internal/cli" "github.com/arduino/arduino-cli/internal/cli/configuration" "github.com/arduino/arduino-cli/internal/cli/feedback" + "github.com/arduino/arduino-cli/internal/i18n" ) func main() { diff --git a/client_example/README.md b/rpc/internal/client_example/README.md similarity index 100% rename from client_example/README.md rename to rpc/internal/client_example/README.md diff --git a/client_example/hello/hello.ino b/rpc/internal/client_example/hello/hello.ino similarity index 100% rename from client_example/hello/hello.ino rename to rpc/internal/client_example/hello/hello.ino diff --git a/client_example/main.go b/rpc/internal/client_example/main.go similarity index 100% rename from client_example/main.go rename to rpc/internal/client_example/main.go diff --git a/client_example/squid.conf b/rpc/internal/client_example/squid.conf similarity index 100% rename from client_example/squid.conf rename to rpc/internal/client_example/squid.conf diff --git a/version/version.go b/version/version.go index 8a207bfa75d..576b48d1b66 100644 --- a/version/version.go +++ b/version/version.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/arduino/arduino-cli/i18n" + "github.com/arduino/arduino-cli/internal/i18n" ) // VersionInfo contains all info injected during build