Skip to content

Commit

Permalink
Update extract lib to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
cmaglie committed Oct 1, 2024
1 parent 95cfd65 commit 1f8d0f6
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .licenses/go/github.com/arduino/go-paths-helper.dep.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/arduino/go-paths-helper
version: v1.11.0
version: v1.12.1
type: go
summary:
homepage: https://pkg.go.dev/github.com/arduino/go-paths-helper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: github.com/codeclysm/extract/v3
version: v3.1.1
name: github.com/codeclysm/extract/v4
version: v4.0.0
type: go
summary: Package extract allows to extract archives in zip, tar.gz or tar.bz2 formats
easily.
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v3
homepage: https://pkg.go.dev/github.com/codeclysm/extract/v4
license: mit
licenses:
- sources: LICENSE
Expand Down
2 changes: 1 addition & 1 deletion .licenses/go/github.com/ulikunitz/xz.dep.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: github.com/ulikunitz/xz
version: v0.5.11
version: v0.5.12
type: go
summary: Package xz supports the compression and decompression of xz files.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz
Expand Down
4 changes: 2 additions & 2 deletions .licenses/go/github.com/ulikunitz/xz/internal/hash.dep.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/ulikunitz/xz/internal/hash
version: v0.5.11
version: v0.5.12
type: go
summary: Package hash provides rolling hashes.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/hash
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions .licenses/go/github.com/ulikunitz/xz/internal/xlog.dep.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: github.com/ulikunitz/xz/internal/xlog
version: v0.5.11
version: v0.5.12
type: go
summary: Package xlog provides a simple logging package that allows to disable certain
message categories.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/internal/xlog
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions .licenses/go/github.com/ulikunitz/xz/lzma.dep.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: github.com/ulikunitz/xz/lzma
version: v0.5.11
version: v0.5.12
type: go
summary: Package lzma supports the decoding and encoding of LZMA streams.
homepage: https://pkg.go.dev/github.com/ulikunitz/xz/lzma
license: bsd-3-clause
licenses:
- sources: [email protected].11/LICENSE
- sources: [email protected].12/LICENSE
text: |
Copyright (c) 2014-2022 Ulrich Kunitz
All rights reserved.
Expand Down
6 changes: 3 additions & 3 deletions .licenses/go/golang.org/x/sys/execabs.dep.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: golang.org/x/sys/execabs
version: v0.13.0
version: v0.16.0
type: go
summary: Package execabs is a drop-in replacement for os/exec that requires PATH lookups
to find absolute paths.
homepage: https://pkg.go.dev/golang.org/x/sys/execabs
license: other
licenses:
- sources: sys@v0.13.0/LICENSE
- sources: sys@v0.16.0/LICENSE
text: |
Copyright (c) 2009 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -36,7 +36,7 @@ licenses:
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- sources: sys@v0.13.0/PATENTS
- sources: sys@v0.16.0/PATENTS
text: |
Additional IP Rights Grant (Patents)
Expand Down
6 changes: 3 additions & 3 deletions .licenses/go/golang.org/x/sys/unix.dep.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: golang.org/x/sys/unix
version: v0.13.0
version: v0.16.0
type: go
summary: Package unix contains an interface to the low-level operating system primitives.
homepage: https://pkg.go.dev/golang.org/x/sys/unix
license: bsd-3-clause
licenses:
- sources: sys@v0.13.0/LICENSE
- sources: sys@v0.16.0/LICENSE
text: |
Copyright (c) 2009 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -35,7 +35,7 @@ licenses:
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- sources: sys@v0.13.0/PATENTS
- sources: sys@v0.16.0/PATENTS
text: |
Additional IP Rights Grant (Patents)
Expand Down
2 changes: 1 addition & 1 deletion arduino/libraries/librariesmanager/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
"github.com/arduino/arduino-cli/arduino/utils"
paths "github.com/arduino/go-paths-helper"
"github.com/codeclysm/extract/v3"
"github.com/codeclysm/extract/v4"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
semver "go.bug.st/relaxed-semver"
Expand Down
2 changes: 1 addition & 1 deletion arduino/resources/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/arduino/arduino-cli/arduino/security"
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
"github.com/arduino/go-paths-helper"
"github.com/codeclysm/extract/v3"
"github.com/codeclysm/extract/v4"
"github.com/sirupsen/logrus"
"go.bug.st/downloader/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion arduino/resources/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"

paths "github.com/arduino/go-paths-helper"
"github.com/codeclysm/extract/v3"
"github.com/codeclysm/extract/v4"
"go.bug.st/cleanup"
)

Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
module github.com/arduino/arduino-cli

go 1.21
go 1.22

toolchain go1.22.3

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

require (
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371
github.com/arduino/go-paths-helper v1.11.0
github.com/arduino/go-paths-helper v1.12.1
github.com/arduino/go-properties-orderedmap v1.8.0
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b
github.com/arduino/go-win32-utils v1.0.0
github.com/cmaglie/pb v1.0.27
github.com/codeclysm/extract/v3 v3.1.1
github.com/codeclysm/extract/v4 v4.0.0
github.com/djherbis/buffer v1.2.0
github.com/djherbis/nio/v3 v3.0.1
github.com/fatih/color v1.15.0
Expand All @@ -30,7 +32,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/xeipuuv/gojsonschema v1.2.0
go.bug.st/cleanup v1.0.0
go.bug.st/downloader/v2 v2.1.1
Expand Down Expand Up @@ -85,7 +87,7 @@ require (
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand All @@ -95,7 +97,7 @@ require (
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/tools v0.13.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
19 changes: 10 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/arduino/go-paths-helper v1.0.1/go.mod h1:HpxtKph+g238EJHq4geEPv9p+gl3v5YYu35Yb+w31Ck=
github.com/arduino/go-paths-helper v1.11.0 h1:hkpGb9AtCTByTj2FKutuHWb3klDf4kAKL10hW+fN+oE=
github.com/arduino/go-paths-helper v1.11.0/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
github.com/arduino/go-paths-helper v1.12.1 h1:WkxiVUxBjKWlLMiMuYy8DcmVrkxdP7aKxQOAq7r2lVM=
github.com/arduino/go-paths-helper v1.12.1/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
github.com/arduino/go-properties-orderedmap v1.8.0 h1:wEfa6hHdpezrVOh787OmClsf/Kd8qB+zE3P2Xbrn0CQ=
github.com/arduino/go-properties-orderedmap v1.8.0/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
github.com/arduino/go-timeutils v0.0.0-20171220113728-d1dd9e313b1b h1:9hDi4F2st6dbLC3y4i02zFT5quS4X6iioWifGlVwfy4=
Expand All @@ -76,8 +76,8 @@ github.com/cmaglie/pb v1.0.27/go.mod h1:GilkKZMXYjBA4NxItWFfO+lwkp59PLHQ+IOW/b/k
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/codeclysm/extract/v3 v3.1.1 h1:iHZtdEAwSTqPrd+1n4jfhr1qBhUWtHlMTjT90+fJVXg=
github.com/codeclysm/extract/v3 v3.1.1/go.mod h1:ZJi80UG2JtfHqJI+lgJSCACttZi++dHxfWuPaMhlOfQ=
github.com/codeclysm/extract/v4 v4.0.0 h1:H87LFsUNaJTu2e/8p/oiuiUsOK/TaPQ5wxsjPnwPEIY=
github.com/codeclysm/extract/v4 v4.0.0/go.mod h1:SFju1lj6as7FvUgalpSct7torJE0zttbJUWtryPRG6s=
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
Expand Down Expand Up @@ -309,12 +309,13 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
Expand Down Expand Up @@ -517,8 +518,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
Expand Down

0 comments on commit 1f8d0f6

Please sign in to comment.