Merge master into Cadence 1.0 feature branch#1565
Merged
turbolent merged 14 commits intoMay 3, 2024
Merged
Conversation
Bumps [github.com/onflow/flow-go-sdk](https://github.com/onflow/flow-go-sdk) from 0.46.2 to 0.46.3. - [Release notes](https://github.com/onflow/flow-go-sdk/releases) - [Commits](onflow/flow-go-sdk@v0.46.2...v0.46.3) --- updated-dependencies: - dependency-name: github.com/onflow/flow-go-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.7.0 to 5.1.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v3.7.0...v5.1.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ci/golangci-lint-action-5.1.0 Bump golangci/golangci-lint-action from 3.7.0 to 5.1.0
…/onflow/flow-go-sdk-0.46.3 Bump github.com/onflow/flow-go-sdk from 0.46.2 to 0.46.3
…eaders (#1558) Co-authored-by: Chase Fleming <1666730+chasefleming@users.noreply.github.com> Co-authored-by: Jordan Ribbink <jribbink@users.noreply.github.com>
Add message if conflicting contract on dependency install
turbolent
requested review from
Kay-Zee,
bjartek,
bluesign,
chasefleming,
devbugging,
ianthpun,
janezpodhostnik,
jribbink and
nvdtf
as code owners
turbolent
changed the title
jribbink
approved these changes
May 2, 2024
nvdtf
approved these changes
May 3, 2024
Base automatically changed from
auto-update-onflow-cadence-v1.0.0-preview.25
to
feature/stable-cadence
May 3, 2024 00:32
|
This PR/issue depends on: |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/stable-cadence #1565 +/- ##
==========================================================
+ Coverage 41.93% 42.13% +0.19%
==========================================================
Files 53 59 +6
Lines 2754 3956 +1202
==========================================================
+ Hits 1155 1667 +512
- Misses 1450 2054 +604
- Partials 149 235 +86
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Depends on #1564
Description
Merge
masterintofeature/stable-cadenceConflict resolution:
commit 82b037adb618fa3cdea4a1778fc494fd9dd86100 Merge: 75655ff1 c2de12d5 Author: Bastian Müller <bastian@turbolent.com> Date: Thu May 2 16:55:26 2024 -0700 Merge branch 'master' into bastian/update-stable-cadence-2 diff --git a/go.mod b/go.mod remerge CONFLICT (content): Merge conflict in go.mod index 08a359d5..1e6d0245 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/gosuri/uilive v0.0.4 github.com/logrusorgru/aurora/v4 v4.0.0 github.com/manifoldco/promptui v0.9.0 -<<<<<<< 75655ff1 (adjust code to API changes in cadence package) github.com/onflow/cadence v1.0.0-preview.25 github.com/onflow/cadence-tools/languageserver v1.0.0-preview.14 github.com/onflow/cadence-tools/lint v1.0.0-preview.17 @@ -26,20 +25,6 @@ require ( github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.18 github.com/onflow/go-ethereum v1.13.4 github.com/onflowser/flowser/v3 v3.2.1-0.20240131200229-7d4d22715f48 -======= - github.com/onflow/cadence v0.42.10 - github.com/onflow/cadence-tools/languageserver v0.33.5 - github.com/onflow/cadence-tools/lint v0.14.2 - github.com/onflow/cadence-tools/test v0.14.7 - github.com/onflow/fcl-dev-wallet v0.7.4 - github.com/onflow/flixkit-go v1.1.3 - github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f - github.com/onflow/flow-emulator v0.62.1 - github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5 - github.com/onflow/flow-go-sdk v0.46.3 - github.com/onflow/flowkit v1.17.3 - github.com/onflowser/flowser/v3 v3.1.3 ->>>>>>> c2de12d5 (Default `flow test` behaviour to test `**/*_test.cdc` (#1550)) github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/pkg/errors v0.9.1 github.com/psiemens/sconfig v0.1.0 diff --git a/go.sum b/go.sum remerge CONFLICT (content): Merge conflict in go.sum index 15c56b12..21d90620 100644 --- a/go.sum +++ b/go.sum @@ -2073,7 +2073,6 @@ github.com/onflow/contract-updater/lib/go/templates v1.0.1/go.mod h1:OXO6s0X7OW4 github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A= github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI= -<<<<<<< 75655ff1 (adjust code to API changes in cadence package) github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1 h1:IqdUzdqFCSW0klWmA3J9c17ZyQTab9SWcWSLouX6o0Q= github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1/go.mod h1:kc42jkiuoPJmxMRFjfbRO9XvnR/3XLheaOerxVMDTiw= github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.13 h1:/3oNbdEsi98SWlSzmabe1DXfy4OCUSC1Gwe9vFX6anY= @@ -2104,33 +2103,6 @@ github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030 h1: github.com/onflow/flow/protobuf/go/flow v0.4.1-0.20240412170550-911321113030/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.18 h1:vgQ1SpQ9mpTX+c6x1hm71DmaLnHoMr3kIG479Ye0ll4= github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.18/go.mod h1:uQiVIHhm6dXrXDM9SQG00FIaEQgh+TdVvM+ortvpF+M= -======= -github.com/onflow/fcl-dev-wallet v0.7.4 h1:vI6t3U0AO88R/Iitn5KsnniSpbN9Lqsqwvi9EJT4C0k= -github.com/onflow/fcl-dev-wallet v0.7.4/go.mod h1:kc42jkiuoPJmxMRFjfbRO9XvnR/3XLheaOerxVMDTiw= -github.com/onflow/flixkit-go v1.1.3 h1:td94mkklIwXvDP075D0eofPE04oKse24PxvFTyOvMJI= -github.com/onflow/flixkit-go v1.1.3/go.mod h1:qOYI1l7r3gSPk6luTnk95ni020UeTY+E48GuB3Tl0xk= -github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f h1:S8yIZw9LFXfYD1V5H9BiixihHw3GrXVPrmfplSzYaww= -github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:jM6GMAL+m0hjusUgiYDNrixPQ6b9s8xjoJQoEu5bHQI= -github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f h1:Ep+Mpo2miWMe4pjPGIaEvEzshRep30dvNgxqk+//FrQ= -github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f/go.mod h1:ZeLxwaBkzuSInESGjL8/IPZWezF+YOYsYbMrZlhN+q4= -github.com/onflow/flow-emulator v0.62.1 h1:VivECYftZbaIo9oZBVsmeE/LUcxdx7hJJ1ET2rGY8p8= -github.com/onflow/flow-emulator v0.62.1/go.mod h1:JbvxBZ39Q8hOQ5fSwuV0ZJwfaiQeaYTiIY04ws8LcNE= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13 h1:B4ll7e3j+MqTJv2122Enq3RtDNzmIGRu9xjV7fo7un0= -github.com/onflow/flow-ft/lib/go/contracts v0.7.1-0.20230711213910-baad011d2b13/go.mod h1:kTMFIySzEJJeupk+7EmXs0EJ6CBWY/MV9fv9iYQk+RU= -github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5 h1:2785d9unR8CpzJzRQcMz+yjKKRmqN+Kbvu0gKdy6iT4= -github.com/onflow/flow-go v0.33.2-0.20240412174857-015156b297b5/go.mod h1:FkonSWZ60bOtc5MdH+CRHScza34k+uNpa6GwXnRpUvg= -github.com/onflow/flow-go-sdk v0.24.0/go.mod h1:IoptMLPyFXWvyd9yYA6/4EmSeeozl6nJoIv4FaEMg74= -github.com/onflow/flow-go-sdk v0.46.3 h1:kVe3duL2fS0ojcptB3tuZZSyatCqAsPtykso7irIaxo= -github.com/onflow/flow-go-sdk v0.46.3/go.mod h1:tfLjB9FZmwqtT5gaacjvpIhz7KCd67YPm6v+iqYAjEA= -github.com/onflow/flow-go/crypto v0.21.3/go.mod h1:vI6V4CY3R6c4JKBxdcRiR/AnjBfL8OSD97bJc60cLuQ= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0 h1:rhUDeD27jhLwOqQKI/23008CYfnqXErrJvc4EFRP2a0= -github.com/onflow/flow-nft/lib/go/contracts v1.1.0/go.mod h1:YsvzYng4htDgRB9sa9jxdwoTuuhjK8WYWXTyLkIigZY= -github.com/onflow/flow/protobuf/go/flow v0.2.2/go.mod h1:gQxYqCfkI8lpnKsmIjwtN2mV/N2PIwc1I+RUK4HPIc8= -github.com/onflow/flow/protobuf/go/flow v0.4.0 h1:5TGmPwRmnSt7aawgtPGF9ehoGHHir9Cy9LVoAiU9t/E= -github.com/onflow/flow/protobuf/go/flow v0.4.0/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk= -github.com/onflow/flowkit v1.17.3 h1:0Fi3tLnieWOYq95A3ySk3TZ0GUPtKaX8ofssgve9e58= -github.com/onflow/flowkit v1.17.3/go.mod h1:laapt1diM4Pbqt0dotKMH+LbUAOEqgugpH1p4+sPhcw= ->>>>>>> c2de12d5 (Default `flow test` behaviour to test `**/*_test.cdc` (#1550)) github.com/onflow/go-ethereum v1.13.4 h1:iNO86fm8RbBbhZ87ZulblInqCdHnAQVY8okBrNsTevc= github.com/onflow/go-ethereum v1.13.4/go.mod h1:cE/gEUkAffhwbVmMJYz+t1dAfVNHNwZCgc3BWtZxBGY= github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba h1:rIehuhO6bj4FkwE4VzwEjX7MoAlOhUJENBJLqDqVxAo= diff --git a/internal/command/command.go b/internal/command/command.go remerge CONFLICT (content): Merge conflict in internal/command/command.go index 55d6f2d0..797ecdf6 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -261,7 +261,6 @@ func createLogger(logFlag string, formatFlag string) output.Logger { // checkVersion fetches latest version and compares it to local. func checkVersion(logger output.Logger) { -<<<<<<< 75655ff1 (adjust code to API changes in cadence package) currentVersion := build.Semver() if isDevelopment() { return // avoid warning in local development @@ -273,10 +272,7 @@ func checkVersion(logger output.Logger) { return } - resp, err := http.Get("https://raw.githubusercontent.com/onflow/flow-cli/master/version.txt") -======= resp, err := http.Get("https://formulae.brew.sh/api/formula/flow-cli.json") ->>>>>>> c2de12d5 (Default `flow test` behaviour to test `**/*_test.cdc` (#1550)) if err != nil || resp.StatusCode >= 400 { return }For contributor use:
masterbranchFiles changedin the Github PR explorer