Skip to content

Commit edd2ed2

Browse files
authored
Merge pull request #56 from gfanton/feat/bump-kubo-19
2 parents e424307 + b6aee5a commit edd2ed2

File tree

5 files changed

+120
-96
lines changed

5 files changed

+120
-96
lines changed

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
golang: [ '1.18.x', '1.19.x' ]
14+
golang: [ '1.19.x', '1.20.x' ]
1515
os: ['windows-latest', 'macos-latest', 'ubuntu-latest']
1616
env:
1717
OS: ${{ matrix.os }}
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout
2121
uses: actions/[email protected]
2222
- name: Set up Go
23-
uses: actions/setup-go@v2
23+
uses: actions/setup-go@v4
2424
with:
2525
go-version: ${{ matrix.golang }}
2626
- name: Check go.mod and go.sum

fsrepo_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"context"
66
"crypto/rand"
7-
"io/ioutil"
87
"os"
98
"path/filepath"
109
"testing"
@@ -20,7 +19,7 @@ import (
2019

2120
// swap arg order
2221
func testRepoPath(p string, t *testing.T) string {
23-
dir, err := ioutil.TempDir(t.TempDir(), p)
22+
dir, err := os.MkdirTemp(t.TempDir(), p)
2423
require.NoError(t, err)
2524
return filepath.Join(dir, "db.sqlite")
2625
}

go.mod

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module berty.tech/go-ipfs-repo-encrypted
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/ipfs/go-datastore v0.6.0
77
github.com/ipfs/go-ds-sql v0.3.0
88
github.com/ipfs/go-filestore v1.2.0
9-
github.com/ipfs/go-ipfs-keystore v0.0.2
10-
github.com/ipfs/kubo v0.16.0
11-
github.com/libp2p/go-libp2p v0.23.3
12-
github.com/multiformats/go-multiaddr v0.7.0
9+
github.com/ipfs/go-ipfs-keystore v0.1.0
10+
github.com/ipfs/kubo v0.19.0
11+
github.com/libp2p/go-libp2p v0.26.4
12+
github.com/multiformats/go-multiaddr v0.8.0
1313
github.com/mutecomm/go-sqlcipher/v4 v4.4.2
1414
github.com/pkg/errors v0.9.1
15-
github.com/stretchr/testify v1.8.0
15+
github.com/stretchr/testify v1.8.1
1616
)
1717

1818
require (
@@ -24,56 +24,54 @@ require (
2424
github.com/google/uuid v1.3.0 // indirect
2525
github.com/hashicorp/golang-lru v0.5.4 // indirect
2626
github.com/ipfs/bbloom v0.0.4 // indirect
27-
github.com/ipfs/go-block-format v0.0.3 // indirect
28-
github.com/ipfs/go-blockservice v0.4.0 // indirect
27+
github.com/ipfs/go-block-format v0.1.1 // indirect
28+
github.com/ipfs/go-blockservice v0.5.0 // indirect
2929
github.com/ipfs/go-cid v0.3.2 // indirect
3030
github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
3131
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
3232
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
3333
github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
3434
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
35-
github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
35+
github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
3636
github.com/ipfs/go-ipld-format v0.4.0 // indirect
3737
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
38+
github.com/ipfs/go-libipfs v0.6.2 // indirect
3839
github.com/ipfs/go-log v1.0.5 // indirect
3940
github.com/ipfs/go-log/v2 v2.5.1 // indirect
40-
github.com/ipfs/go-merkledag v0.6.0 // indirect
41+
github.com/ipfs/go-merkledag v0.9.0 // indirect
4142
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
4243
github.com/ipfs/go-verifcid v0.0.2 // indirect
43-
github.com/ipfs/interface-go-ipfs-core v0.7.0 // indirect
44-
github.com/ipld/go-codec-dagpb v1.4.1 // indirect
45-
github.com/ipld/go-ipld-prime v0.18.0 // indirect
44+
github.com/ipfs/interface-go-ipfs-core v0.11.0 // indirect
45+
github.com/ipld/go-codec-dagpb v1.5.0 // indirect
46+
github.com/ipld/go-ipld-prime v0.19.0 // indirect
4647
github.com/jbenet/goprocess v0.1.4 // indirect
47-
github.com/klauspost/cpuid/v2 v2.1.1 // indirect
48+
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
4849
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
49-
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
50-
github.com/libp2p/go-openssl v0.1.0 // indirect
51-
github.com/mattn/go-isatty v0.0.16 // indirect
52-
github.com/mattn/go-pointer v0.0.1 // indirect
50+
github.com/mattn/go-isatty v0.0.17 // indirect
5351
github.com/minio/sha256-simd v1.0.0 // indirect
5452
github.com/mitchellh/go-homedir v1.1.0 // indirect
5553
github.com/mr-tron/base58 v1.2.0 // indirect
5654
github.com/multiformats/go-base32 v0.1.0 // indirect
57-
github.com/multiformats/go-base36 v0.1.0 // indirect
55+
github.com/multiformats/go-base36 v0.2.0 // indirect
5856
github.com/multiformats/go-multibase v0.1.1 // indirect
59-
github.com/multiformats/go-multicodec v0.6.0 // indirect
57+
github.com/multiformats/go-multicodec v0.7.0 // indirect
6058
github.com/multiformats/go-multihash v0.2.1 // indirect
61-
github.com/multiformats/go-varint v0.0.6 // indirect
59+
github.com/multiformats/go-multistream v0.4.1 // indirect
60+
github.com/multiformats/go-varint v0.0.7 // indirect
6261
github.com/opentracing/opentracing-go v1.2.0 // indirect
6362
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
6463
github.com/pmezard/go-difflib v1.0.0 // indirect
65-
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
66-
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
64+
github.com/polydawn/refmt v0.89.0 // indirect
6765
github.com/spaolacci/murmur3 v1.1.0 // indirect
68-
github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect
66+
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa // indirect
6967
go.opentelemetry.io/otel v1.7.0 // indirect
7068
go.opentelemetry.io/otel/trace v1.7.0 // indirect
7169
go.uber.org/atomic v1.10.0 // indirect
72-
go.uber.org/multierr v1.8.0 // indirect
73-
go.uber.org/zap v1.23.0 // indirect
74-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
75-
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
76-
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
70+
go.uber.org/multierr v1.9.0 // indirect
71+
go.uber.org/zap v1.24.0 // indirect
72+
golang.org/x/crypto v0.5.0 // indirect
73+
golang.org/x/sys v0.5.0 // indirect
74+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
7775
google.golang.org/protobuf v1.28.1 // indirect
7876
gopkg.in/yaml.v3 v3.0.1 // indirect
7977
lukechampine.com/blake3 v1.1.7 // indirect

0 commit comments

Comments
 (0)