Skip to content

Commit 4e41fee

Browse files
B. Olaussonclaude
andcommitted
chore: reconcile go.mod with rebased gluon after Nescio rebase
Build-graph fallout from rebasing the X-GM-EXT-1 commits onto upstream Nescio (Bridge 3.24.2). Not part of the feature itself. - go mod tidy aligns Bridge's module graph with the rebased local gluon (juniper, logrus, goleak, x/sys, x/text, go-sqlite3 bumps) - Pin golang.org/x/exp to upstream's expected version via replace: the local gluon replace dropped x/exp (BRIDGE-534 moved it to stdlib), which otherwise lets go mod tidy float x/exp forward and break slices.SortFunc in upstream's internal/usertypes. Squash or reword as preferred before any upstream submission; the three feature commits above are kept clean and independent of this. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 6335585 commit 4e41fee

2 files changed

Lines changed: 31 additions & 38 deletions

File tree

go.mod

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/PuerkitoBio/goquery v1.8.1
1313
github.com/abiosoft/ishell v2.0.0+incompatible
1414
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
15-
github.com/bradenaw/juniper v0.12.0
15+
github.com/bradenaw/juniper v0.15.3
1616
github.com/cucumber/godog v0.12.5
1717
github.com/cucumber/messages-go/v16 v16.0.1
1818
github.com/docker/docker-credential-helpers v0.8.1
@@ -42,16 +42,16 @@ require (
4242
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
4343
github.com/pkg/errors v0.9.1
4444
github.com/pkg/profile v1.7.0
45-
github.com/sirupsen/logrus v1.9.3
45+
github.com/sirupsen/logrus v1.9.4
4646
github.com/stretchr/testify v1.11.1
4747
github.com/urfave/cli/v2 v2.24.4
4848
github.com/vmihailenco/msgpack/v5 v5.3.5
49-
go.uber.org/goleak v1.2.1
50-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
49+
go.uber.org/goleak v1.3.0
50+
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
5151
golang.org/x/net v0.52.0
5252
golang.org/x/oauth2 v0.36.0
53-
golang.org/x/sys v0.42.0
54-
golang.org/x/text v0.35.0
53+
golang.org/x/sys v0.43.0
54+
golang.org/x/text v0.36.0
5555
google.golang.org/api v0.272.0
5656
google.golang.org/grpc v1.79.2
5757
google.golang.org/protobuf v1.36.11
@@ -110,7 +110,7 @@ require (
110110
github.com/mattn/go-colorable v0.1.14 // indirect
111111
github.com/mattn/go-isatty v0.0.20 // indirect
112112
github.com/mattn/go-runewidth v0.0.21 // indirect
113-
github.com/mattn/go-sqlite3 v1.14.37 // indirect
113+
github.com/mattn/go-sqlite3 v1.14.42 // indirect
114114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
115115
github.com/modern-go/reflect2 v1.0.2 // indirect
116116
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
@@ -153,4 +153,8 @@ replace (
153153
github.com/go-resty/resty/v2 => github.com/ProtonMail/resty/v2 v2.0.0-20250929142426-e3dc6308c80b
154154
github.com/keybase/go-keychain => github.com/ProtonMail/go-keychain v0.0.0-20250929142014-ea8548dff768
155155
github.com/keys-pub/go-libfido2 => github.com/ProtonMail/go-libfido2 v0.0.0-20250916110427-df894d6d07a1
156+
// Pin x/exp to the version upstream's internal/usertypes expects.
157+
// The local gluon replace (which dropped x/exp) lets `go mod tidy`
158+
// otherwise float x/exp forward and break slices.SortFunc upstream.
159+
golang.org/x/exp => golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
156160
)

0 commit comments

Comments
 (0)