Skip to content

Commit 57250f9

Browse files
authored
META-2220 - Bump rardecode to github.com/nwaples/rardecode/v2 v2.2.2 (#7)
Also bump go to latest 1.25.5
1 parent cfd078e commit 57250f9

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Go
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.20.x
24+
go-version: 1.25.x
2525
cache: false
2626

2727
- name: Build

cmd/arc/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313

1414
"github.com/klauspost/compress/zip"
15-
"github.com/nwaples/rardecode"
15+
"github.com/nwaples/rardecode/v2"
1616
)
1717

1818
var (

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/jfrog/archiver/v3
22

3-
go 1.20
3+
go 1.25.5
44

55
require (
66
github.com/andybalholm/brotli v1.1.0
77
github.com/dsnet/compress v0.0.1
88
github.com/golang/snappy v0.0.4
99
github.com/klauspost/compress v1.17.9
1010
github.com/klauspost/pgzip v1.2.6
11-
github.com/nwaples/rardecode v1.1.3
11+
github.com/nwaples/rardecode/v2 v2.2.2
1212
github.com/pierrec/lz4/v4 v4.1.21
1313
github.com/ulikunitz/xz v0.5.12
1414
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ib
1111
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
1212
github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
1313
github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
14-
github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
15-
github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
14+
github.com/nwaples/rardecode/v2 v2.2.2 h1:/5oL8dzYivRM/tqX9VcTSWfbpwcbwKG1QtSJr3b3KcU=
15+
github.com/nwaples/rardecode/v2 v2.2.2/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
1616
github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
1717
github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
1818
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=

rar.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"time"
1313

14-
"github.com/nwaples/rardecode"
14+
"github.com/nwaples/rardecode/v2"
1515
)
1616

1717
// Rar provides facilities for reading RAR archives.
@@ -132,7 +132,7 @@ func (r *Rar) addTopLevelFolder(sourceArchive, destination string) (string, erro
132132
}
133133
defer file.Close()
134134

135-
rc, err := rardecode.NewReader(file, r.Password)
135+
rc, err := rardecode.NewReader(file, rardecode.Password(r.Password))
136136
if err != nil {
137137
return "", fmt.Errorf("creating archive reader: %v", err)
138138
}
@@ -238,7 +238,7 @@ func (r *Rar) OpenFile(filename string) error {
238238
return fmt.Errorf("rar archive is already open for reading")
239239
}
240240
var err error
241-
r.rc, err = rardecode.OpenReader(filename, r.Password)
241+
r.rc, err = rardecode.OpenReader(filename, rardecode.Password(r.Password))
242242
if err != nil {
243243
return err
244244
}
@@ -253,7 +253,7 @@ func (r *Rar) Open(in io.Reader, size int64) error {
253253
return fmt.Errorf("rar archive is already open for reading")
254254
}
255255
var err error
256-
r.rr, err = rardecode.NewReader(in, r.Password)
256+
r.rr, err = rardecode.NewReader(in, rardecode.Password(r.Password))
257257
return err
258258
}
259259

0 commit comments

Comments
 (0)