Skip to content

Commit 1f8d0f6

Browse files
committed
Update extract lib to v4
1 parent 95cfd65 commit 1f8d0f6

File tree

13 files changed

+38
-35
lines changed

13 files changed

+38
-35
lines changed

.licenses/go/github.com/arduino/go-paths-helper.dep.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: github.com/arduino/go-paths-helper
3-
version: v1.11.0
3+
version: v1.12.1
44
type: go
55
summary:
66
homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper

.licenses/go/github.com/codeclysm/extract/v3.dep.yml renamed to .licenses/go/github.com/codeclysm/extract/v4.dep.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
name: github.com/codeclysm/extract/v3
3-
version: v3.1.1
2+
name: github.com/codeclysm/extract/v4
3+
version: v4.0.0
44
type: go
55
summary: Package extract allows to extract archives in zip, tar.gz or tar.bz2 formats
66
easily.
7-
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v3
7+
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v4
88
license: mit
99
licenses:
1010
- sources: LICENSE

.licenses/go/github.com/ulikunitz/xz.dep.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: github.com/ulikunitz/xz
3-
version: v0.5.11
3+
version: v0.5.12
44
type: go
55
summary: Package xz supports the compression and decompression of xz files.
66
homepage: https://pkg.go.dev/github.com/ulikunitz/xz

.licenses/go/github.com/ulikunitz/xz/internal/hash.dep.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: github.com/ulikunitz/xz/internal/hash
3-
version: v0.5.11
3+
version: v0.5.12
44
type: go
55
summary: Package hash provides rolling hashes.
66
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/hash
77
license: bsd-3-clause
88
licenses:
9-
- sources: [email protected].11/LICENSE
9+
- sources: [email protected].12/LICENSE
1010
text: |
1111
Copyright (c) 2014-2022 Ulrich Kunitz
1212
All rights reserved.

.licenses/go/github.com/ulikunitz/xz/internal/xlog.dep.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
name: github.com/ulikunitz/xz/internal/xlog
3-
version: v0.5.11
3+
version: v0.5.12
44
type: go
55
summary: Package xlog provides a simple logging package that allows to disable certain
66
message categories.
77
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/xlog
88
license: bsd-3-clause
99
licenses:
10-
- sources: [email protected].11/LICENSE
10+
- sources: [email protected].12/LICENSE
1111
text: |
1212
Copyright (c) 2014-2022 Ulrich Kunitz
1313
All rights reserved.

.licenses/go/github.com/ulikunitz/xz/lzma.dep.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: github.com/ulikunitz/xz/lzma
3-
version: v0.5.11
3+
version: v0.5.12
44
type: go
55
summary: Package lzma supports the decoding and encoding of LZMA streams.
66
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/lzma
77
license: bsd-3-clause
88
licenses:
9-
- sources: [email protected].11/LICENSE
9+
- sources: [email protected].12/LICENSE
1010
text: |
1111
Copyright (c) 2014-2022 Ulrich Kunitz
1212
All rights reserved.

.licenses/go/golang.org/x/sys/execabs.dep.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
name: golang.org/x/sys/execabs
3-
version: v0.13.0
3+
version: v0.16.0
44
type: go
55
summary: Package execabs is a drop-in replacement for os/exec that requires PATH lookups
66
to find absolute paths.
77
homepage: https://pkg.go.dev/golang.org/x/sys/execabs
88
license: other
99
licenses:
10-
- sources: sys@v0.13.0/LICENSE
10+
- sources: sys@v0.16.0/LICENSE
1111
text: |
1212
Copyright (c) 2009 The Go Authors. All rights reserved.
1313
@@ -36,7 +36,7 @@ licenses:
3636
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3737
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3838
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39-
- sources: sys@v0.13.0/PATENTS
39+
- sources: sys@v0.16.0/PATENTS
4040
text: |
4141
Additional IP Rights Grant (Patents)
4242

.licenses/go/golang.org/x/sys/unix.dep.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: golang.org/x/sys/unix
3-
version: v0.13.0
3+
version: v0.16.0
44
type: go
55
summary: Package unix contains an interface to the low-level operating system primitives.
66
homepage: https://pkg.go.dev/golang.org/x/sys/unix
77
license: bsd-3-clause
88
licenses:
9-
- sources: sys@v0.13.0/LICENSE
9+
- sources: sys@v0.16.0/LICENSE
1010
text: |
1111
Copyright (c) 2009 The Go Authors. All rights reserved.
1212
@@ -35,7 +35,7 @@ licenses:
3535
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3636
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3737
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38-
- sources: sys@v0.13.0/PATENTS
38+
- sources: sys@v0.16.0/PATENTS
3939
text: |
4040
Additional IP Rights Grant (Patents)
4141

arduino/libraries/librariesmanager/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
2929
"github.com/arduino/arduino-cli/arduino/utils"
3030
paths "github.com/arduino/go-paths-helper"
31-
"github.com/codeclysm/extract/v3"
31+
"github.com/codeclysm/extract/v4"
3232
"github.com/go-git/go-git/v5"
3333
"github.com/go-git/go-git/v5/plumbing"
3434
semver "go.bug.st/relaxed-semver"

arduino/resources/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/arduino/arduino-cli/arduino/security"
2828
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2929
"github.com/arduino/go-paths-helper"
30-
"github.com/codeclysm/extract/v3"
30+
"github.com/codeclysm/extract/v4"
3131
"github.com/sirupsen/logrus"
3232
"go.bug.st/downloader/v2"
3333
)

arduino/resources/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222

2323
paths "github.com/arduino/go-paths-helper"
24-
"github.com/codeclysm/extract/v3"
24+
"github.com/codeclysm/extract/v4"
2525
"go.bug.st/cleanup"
2626
)
2727

go.mod

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
module github.com/arduino/arduino-cli
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.3
46

57
// We must use this fork until https://github.com/mailru/easyjson/pull/372 is merged
68
replace github.com/mailru/easyjson => github.com/cmaglie/easyjson v0.8.1
79

810
require (
911
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371
10-
github.com/arduino/go-paths-helper v1.11.0
12+
github.com/arduino/go-paths-helper v1.12.1
1113
github.com/arduino/go-properties-orderedmap v1.8.0
1214
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
1315
github.com/arduino/go-win32-utils v1.0.0
1416
github.com/cmaglie/pb v1.0.27
15-
github.com/codeclysm/extract/v3 v3.1.1
17+
github.com/codeclysm/extract/v4 v4.0.0
1618
github.com/djherbis/buffer v1.2.0
1719
github.com/djherbis/nio/v3 v3.0.1
1820
github.com/fatih/color v1.15.0
@@ -30,7 +32,7 @@ require (
3032
github.com/sirupsen/logrus v1.9.3
3133
github.com/spf13/cobra v1.7.0
3234
github.com/spf13/viper v1.17.0
33-
github.com/stretchr/testify v1.8.4
35+
github.com/stretchr/testify v1.9.0
3436
github.com/xeipuuv/gojsonschema v1.2.0
3537
go.bug.st/cleanup v1.0.0
3638
go.bug.st/downloader/v2 v2.1.1
@@ -85,7 +87,7 @@ require (
8587
github.com/spf13/cast v1.5.1 // indirect
8688
github.com/spf13/pflag v1.0.5 // indirect
8789
github.com/subosito/gotenv v1.6.0 // indirect
88-
github.com/ulikunitz/xz v0.5.11 // indirect
90+
github.com/ulikunitz/xz v0.5.12 // indirect
8991
github.com/xanzy/ssh-agent v0.3.3 // indirect
9092
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
9193
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -95,7 +97,7 @@ require (
9597
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
9698
golang.org/x/mod v0.12.0 // indirect
9799
golang.org/x/net v0.17.0 // indirect
98-
golang.org/x/sys v0.13.0 // indirect
100+
golang.org/x/sys v0.16.0 // indirect
99101
golang.org/x/tools v0.13.0 // indirect
100102
gopkg.in/ini.v1 v1.67.0 // indirect
101103
gopkg.in/warnings.v0 v0.1.2 // indirect

go.sum

+10-9
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
5151
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
5252
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
5353
github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
54-
github.com/arduino/go-paths-helper v1.11.0 h1:hkpGb9AtCTByTj2FKutuHWb3klDf4kAKL10hW+fN+oE=
55-
github.com/arduino/go-paths-helper v1.11.0/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
54+
github.com/arduino/go-paths-helper v1.12.1 h1:WkxiVUxBjKWlLMiMuYy8DcmVrkxdP7aKxQOAq7r2lVM=
55+
github.com/arduino/go-paths-helper v1.12.1/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
5656
github.com/arduino/go-properties-orderedmap v1.8.0 h1:wEfa6hHdpezrVOh787OmClsf/Kd8qB+zE3P2Xbrn0CQ=
5757
github.com/arduino/go-properties-orderedmap v1.8.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
5858
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=
@@ -76,8 +76,8 @@ github.com/cmaglie/pb v1.0.27/go.mod h1:GilkKZMXYjBA4NxItWFfO+lwkp59PLHQ+IOW/b/k
7676
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
7777
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
7878
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
79-
github.com/codeclysm/extract/v3 v3.1.1 h1:iHZtdEAwSTqPrd+1n4jfhr1qBhUWtHlMTjT90+fJVXg=
80-
github.com/codeclysm/extract/v3 v3.1.1/go.mod h1:ZJi80UG2JtfHqJI+lgJSCACttZi++dHxfWuPaMhlOfQ=
79+
github.com/codeclysm/extract/v4 v4.0.0 h1:H87LFsUNaJTu2e/8p/oiuiUsOK/TaPQ5wxsjPnwPEIY=
80+
github.com/codeclysm/extract/v4 v4.0.0/go.mod h1:SFju1lj6as7FvUgalpSct7torJE0zttbJUWtryPRG6s=
8181
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
8282
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
8383
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
@@ -309,12 +309,13 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
309309
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
310310
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
311311
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
312-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
313312
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
313+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
314+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
314315
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
315316
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
316-
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
317-
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
317+
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
318+
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
318319
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
319320
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
320321
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
@@ -517,8 +518,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
517518
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
518519
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
519520
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
520-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
521-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
521+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
522+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
522523
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
523524
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
524525
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

0 commit comments

Comments
 (0)