Merge branch 'typesutil' into mod

goplus · Nov 9, 2023 · c0c425c · c0c425c
2 parents bf03cc9 + ebbeb24
commit c0c425c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cmd/internal/install/install.go b/cmd/internal/install/install.go
@@ -30,6 +30,7 @@ import (
  "github.com/goplus/gop/x/gopenv"
  "github.com/goplus/gop/x/gopprojs"
  "github.com/goplus/gox"
+ "github.com/goplus/mod/modfetch"
 )
 
 // gop install
@@ -65,6 +66,7 @@ func runCmd(cmd *base.Command, args []string) {
  }
 
  if *flagDebug {
+ modfetch.SetDebug(modfetch.DbgFlagAll)
  gox.SetDebug(gox.DbgFlagAll &^ gox.DbgFlagComments)
  cl.SetDebug(cl.DbgFlagAll)
  cl.SetDisableRecover(true)

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
  github.com/fsnotify/fsnotify v1.7.0
  github.com/goplus/c2go v0.7.17-0.20231103102716-f59c28136a0b
  github.com/goplus/gox v1.12.2-0.20231103090303-19b970256b0e
- github.com/goplus/mod v0.11.8
+ github.com/goplus/mod v0.11.9-0.20231109165158-5c735e04d6fb
  github.com/qiniu/x v1.13.1
  golang.org/x/tools v0.14.0
 )
@@ -15,6 +15,6 @@ require (
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
- golang.org/x/mod v0.13.0 // indirect
+ golang.org/x/mod v0.14.0 // indirect
  golang.org/x/sys v0.13.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -8,8 +8,9 @@ github.com/goplus/c2go v0.7.17-0.20231103102716-f59c28136a0b h1:qtQfKpXI2wx1N1wc
 github.com/goplus/c2go v0.7.17-0.20231103102716-f59c28136a0b/go.mod h1:fVpYuVxuvIQCrEhVrMkvivFwnWzr3EWWBQrnkfMMN+M=
 github.com/goplus/gox v1.12.2-0.20231103090303-19b970256b0e h1:l1a+oX9m3xWuHWXVGRpnNo+/vag8qR8DQ933euQlS6w=
 github.com/goplus/gox v1.12.2-0.20231103090303-19b970256b0e/go.mod h1:MOJnwqA8/rSUkn0vsayHFK7TD/3XQrdexMTqdzR70X0=
-github.com/goplus/mod v0.11.8 h1:90Kbg+MJhrdsonNGXYx3HUcW4IbBlRHYpIMssJaMMxM=
 github.com/goplus/mod v0.11.8/go.mod h1:yl2QncBKTdXk+8UaNsdo4u2zSpGEJYA5JKjgD3K2h00=
+github.com/goplus/mod v0.11.9-0.20231109165158-5c735e04d6fb h1:kImRo9JBfw+XcY5YCbucjYPcdMxdjtbEw8qFCnYxVA8=
+github.com/goplus/mod v0.11.9-0.20231109165158-5c735e04d6fb/go.mod h1:YxrBMhvWGcvLU14j8e7qyKSVnj5Loba7GgH1rNXJtDg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
@@ -31,8 +32,9 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
 golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=