Skip to content

chore(deps): bump go.uber.org/mock from 0.5.2 to 0.6.0 - #805

Draft
nieblara wants to merge 1 commit into
mainfrom
cursor/bump-uber-mock-0-6-0-1e5e
Draft

nieblara wants to merge 1 commit into
mainfrom
cursor/bump-uber-mock-0-6-0-1e5e

Conversation

@nieblara

Copy link
Copy Markdown
Contributor

Requirements

  • I have added test coverage for new or changed functionality
  • I have followed the repository's pull request submission guidelines
  • I have validated my changes against all supported platform versions

Related issues

Resolves the merge conflicts on #621 (dependabot/go_modules/go.uber.org/mock-0.6.0). That PR is CONFLICTING against main (88 commits behind).

Describe the solution you've provided

Re-applies only the intended direct bump on current main:

  • go.uber.org/mock v0.5.2v0.6.0
  • Matching go.sum checksums only

The original PR also tried to move golang.org/x/{term,mod,net,sys,tools} to versions that are now older than main. Those hunks were dropped so this does not downgrade:

  • golang.org/x/term stays v0.40.0
  • golang.org/x/mod stays v0.33.0
  • golang.org/x/net stays v0.50.0
  • golang.org/x/sys stays v0.41.0
  • golang.org/x/tools stays v0.42.0

No application source or mockgen changes. go.uber.org/mock v0.6.0 is API-compatible here.

Describe alternatives you've considered

Merging the Dependabot branch and hand-resolving go.mod/go.sum conflict markers. Recreating the bump on latest main is smaller and avoids replaying stale transitive pins.

Additional context

go build succeeded. Packages that import mock (internal/dev_server/sdk, model, adapters) passed. Original PR 621 can be closed once this lands.

Open in Web Open in Cursor 

Co-authored-by: Ramon Niebla <nieblara@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants