Skip to content

Commit 335acdc

Browse files
authored
Merge pull request #664 from onflow/bastian/update-cadence-in-flowkit
Update to Cadence v0.27.0 and Emulator v0.37.0
2 parents 30e91b0 + def7809 commit 335acdc

File tree

12 files changed

+343
-246
lines changed

12 files changed

+343
-246
lines changed

go.mod

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ require (
66
github.com/getsentry/sentry-go v0.13.0
77
github.com/go-git/go-git/v5 v5.4.2
88
github.com/manifoldco/promptui v0.9.0
9-
github.com/onflow/cadence v0.26.0
10-
github.com/onflow/cadence/languageserver v0.26.2
9+
github.com/onflow/cadence v0.27.0
10+
github.com/onflow/cadence-tools/languageserver v0.0.0-20220926202318-0d961fc5d7e7
1111
github.com/onflow/fcl-dev-wallet v0.5.1
12-
github.com/onflow/flow-cli/pkg/flowkit v0.0.0-20220819152715-414ca9c1d221
13-
github.com/onflow/flow-emulator v0.36.0
14-
github.com/onflow/flow-go-sdk v0.27.1
12+
github.com/onflow/flow-cli/pkg/flowkit v0.0.0-20220926143050-dfd5770b1cd7
13+
github.com/onflow/flow-emulator v0.37.0
14+
github.com/onflow/flow-go-sdk v0.28.0
1515
github.com/psiemens/sconfig v0.1.0
1616
github.com/spf13/afero v1.9.0
1717
github.com/spf13/cobra v1.5.0
@@ -38,7 +38,7 @@ require (
3838
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3939
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
4040
github.com/davecgh/go-spew v1.1.1 // indirect
41-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
41+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
4242
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
4343
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
4444
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de // indirect
@@ -80,13 +80,15 @@ require (
8080
github.com/klauspost/compress v1.15.1 // indirect
8181
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
8282
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
83-
github.com/libp2p/go-libp2p-core v0.19.1 // indirect
83+
github.com/libp2p/go-libp2p v0.22.0 // indirect
84+
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
8485
github.com/libp2p/go-libp2p-tls v0.4.1 // indirect
85-
github.com/libp2p/go-openssl v0.0.7 // indirect
86+
github.com/libp2p/go-openssl v0.1.0 // indirect
8687
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
8788
github.com/magiconair/properties v1.8.6 // indirect
8889
github.com/mattn/go-colorable v0.1.12 // indirect
89-
github.com/mattn/go-isatty v0.0.14 // indirect
90+
github.com/mattn/go-isatty v0.0.16 // indirect
91+
github.com/mattn/go-pointer v0.0.1 // indirect
9092
github.com/mattn/go-runewidth v0.0.13 // indirect
9193
github.com/mattn/go-tty v0.0.3 // indirect
9294
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -99,14 +101,14 @@ require (
99101
github.com/multiformats/go-multiaddr v0.6.0 // indirect
100102
github.com/multiformats/go-multibase v0.1.1 // indirect
101103
github.com/multiformats/go-multicodec v0.5.0 // indirect
102-
github.com/multiformats/go-multihash v0.2.0 // indirect
104+
github.com/multiformats/go-multihash v0.2.1 // indirect
103105
github.com/multiformats/go-varint v0.0.6 // indirect
104106
github.com/onflow/atree v0.4.0 // indirect
105-
github.com/onflow/cadence-lint v0.0.0-20220711153841-433de417d437 // indirect
107+
github.com/onflow/cadence-tools/lint v0.0.0-20220926195650-cd6d435f7146 // indirect
106108
github.com/onflow/flow-core-contracts/lib/go/contracts v0.11.2-0.20220720151516-797b149ceaaa // indirect
107109
github.com/onflow/flow-core-contracts/lib/go/templates v0.11.2-0.20220720151516-797b149ceaaa // indirect
108110
github.com/onflow/flow-ft/lib/go/contracts v0.5.0 // indirect
109-
github.com/onflow/flow-go v0.26.14-test-synchronization.0.20220901173643-b7c385a64812 // indirect
111+
github.com/onflow/flow-go v0.26.14-test-synchronization.0.20220924005019-be5302fb1342 // indirect
110112
github.com/onflow/flow-go/crypto v0.24.4 // indirect
111113
github.com/onflow/flow-nft/lib/go/contracts v0.0.0-20220727161549-d59b1e547ac4 // indirect
112114
github.com/onflow/flow/protobuf/go/flow v0.3.1 // indirect
@@ -120,8 +122,8 @@ require (
120122
github.com/pmezard/go-difflib v1.0.0 // indirect
121123
github.com/prometheus/client_golang v1.12.1 // indirect
122124
github.com/prometheus/client_model v0.2.0 // indirect
123-
github.com/prometheus/common v0.35.0 // indirect
124-
github.com/prometheus/procfs v0.7.3 // indirect
125+
github.com/prometheus/common v0.37.0 // indirect
126+
github.com/prometheus/procfs v0.8.0 // indirect
125127
github.com/psiemens/graceland v1.0.0 // indirect
126128
github.com/rivo/uniseg v0.2.1-0.20211004051800-57c86be7915a // indirect
127129
github.com/rs/cors v1.8.0 // indirect
@@ -157,12 +159,12 @@ require (
157159
go.opentelemetry.io/otel/sdk v1.8.0 // indirect
158160
go.opentelemetry.io/otel/trace v1.8.0 // indirect
159161
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
160-
go.uber.org/atomic v1.9.0 // indirect
162+
go.uber.org/atomic v1.10.0 // indirect
161163
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
162164
golang.org/x/exp v0.0.0-20220713135740-79cabaa25d75 // indirect
163-
golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect
165+
golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
164166
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
165-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
167+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
166168
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
167169
golang.org/x/text v0.3.7 // indirect
168170
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
@@ -171,12 +173,12 @@ require (
171173
google.golang.org/appengine v1.6.7 // indirect
172174
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
173175
google.golang.org/grpc v1.46.2 // indirect
174-
google.golang.org/protobuf v1.28.0 // indirect
176+
google.golang.org/protobuf v1.28.1 // indirect
175177
gopkg.in/ini.v1 v1.66.6 // indirect
176178
gopkg.in/warnings.v0 v0.1.2 // indirect
177179
gopkg.in/yaml.v2 v2.4.0 // indirect
178180
gopkg.in/yaml.v3 v3.0.1 // indirect
179181
lukechampine.com/blake3 v1.1.7 // indirect
180182
)
181183

182-
replace github.com/onflow/flow-cli/pkg/flowkit => ./pkg/flowkit
184+
replace github.com/onflow/flow-cli/pkg/flowkit => ./pkg/flowkit

0 commit comments

Comments
 (0)