Skip to content

Commit 702c223

Browse files
committed
Vendored go-configmap library and made it internal
1 parent f9d9040 commit 702c223

File tree

16 files changed

+248
-154
lines changed

16 files changed

+248
-154
lines changed

go-configmap/go.mod

Lines changed: 0 additions & 13 deletions
This file was deleted.

go-configmap/go.sum

Lines changed: 0 additions & 10 deletions
This file was deleted.

go-configmap/json.go

Lines changed: 0 additions & 37 deletions
This file was deleted.

go-configmap/json_test.go

Lines changed: 0 additions & 33 deletions
This file was deleted.

go-configmap/yaml.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

go-configmap/yaml_test.go

Lines changed: 0 additions & 33 deletions
This file was deleted.

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ go 1.21
55
// We must use this fork until https://github.com/mailru/easyjson/pull/372 is merged
66
replace github.com/mailru/easyjson => github.com/cmaglie/easyjson v0.8.1
77

8-
replace github.com/arduino/go-configmap => ./go-configmap
9-
108
require (
119
github.com/ProtonMail/go-crypto v1.1.0-alpha.0
12-
github.com/arduino/go-configmap v0.0.1
1310
github.com/arduino/go-paths-helper v1.12.0
1411
github.com/arduino/go-properties-orderedmap v1.8.0
1512
github.com/arduino/go-serial-utils v0.1.2

internal/cli/configuration/configuration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"runtime"
2222

2323
"github.com/arduino/arduino-cli/internal/cli/feedback"
24+
"github.com/arduino/arduino-cli/internal/go-configmap"
2425
"github.com/arduino/arduino-cli/internal/i18n"
25-
"github.com/arduino/go-configmap"
2626
"github.com/arduino/go-win32-utils"
2727
)
2828

go-configmap/cli.go renamed to internal/go-configmap/cli.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// This file is part of arduino-cli.
2+
//
3+
// Copyright 2024 ARDUINO SA (http://www.arduino.cc/)
4+
//
5+
// This software is released under the GNU General Public License version 3,
6+
// which covers the main part of arduino-cli.
7+
// The terms of this license can be found at:
8+
// https://www.gnu.org/licenses/gpl-3.0.en.html
9+
//
10+
// You can be released from the requirements of the above licenses by purchasing
11+
// a commercial license. Buying such a license is mandatory if you want to
12+
// modify or otherwise use the software for commercial activities involving the
13+
// Arduino software without disclosing the source code of your own applications.
14+
// To purchase a commercial license, send an email to [email protected].
15+
116
package configmap
217

318
import (

go-configmap/configuration.go renamed to internal/go-configmap/configuration.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
// This file is part of arduino-cli.
2+
//
3+
// Copyright 2024 ARDUINO SA (http://www.arduino.cc/)
4+
//
5+
// This software is released under the GNU General Public License version 3,
6+
// which covers the main part of arduino-cli.
7+
// The terms of this license can be found at:
8+
// https://www.gnu.org/licenses/gpl-3.0.en.html
9+
//
10+
// You can be released from the requirements of the above licenses by purchasing
11+
// a commercial license. Buying such a license is mandatory if you want to
12+
// modify or otherwise use the software for commercial activities involving the
13+
// Arduino software without disclosing the source code of your own applications.
14+
// To purchase a commercial license, send an email to [email protected].
15+
116
package configmap
217

318
import (

0 commit comments

Comments
 (0)