Skip to content

Commit

Permalink
fix: temp patch cloud.google.com/go ambiguity (#2560)
Browse files Browse the repository at this point in the history
Force dependency on `cloud.google.com/go` main module to resolve ambiguity.

Fixes #2543
Updates #2559
  • Loading branch information
noahdietz committed Apr 30, 2024
1 parent 1b6db6c commit 3eb92f1
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 0 deletions.
7 changes: 7 additions & 0 deletions doc.go
Expand Up @@ -143,3 +143,10 @@
// // Do something with the response
// fmt.Println(op.Response)
package api

import (
// Force dependency on main module to ensure it is unambiguous during
// module resolution.
// See: https://github.com/googleapis/google-api-go-client/issues/2559.
_ "cloud.google.com/go/civil"
)
1 change: 1 addition & 0 deletions go.mod
Expand Up @@ -3,6 +3,7 @@ module google.golang.org/api
go 1.19

require (
cloud.google.com/go v0.112.0
cloud.google.com/go/auth v0.3.0
cloud.google.com/go/auth/oauth2adapt v0.2.2
cloud.google.com/go/compute/metadata v0.3.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
@@ -1,4 +1,6 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM=
cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4=
cloud.google.com/go/auth v0.3.0 h1:PRyzEpGfx/Z9e8+lHsbkoUVXD0gnu4MNmm7Gp8TQNIs=
cloud.google.com/go/auth v0.3.0/go.mod h1:lBv6NKTWp8E3LPzmO1TbiiRKc4drLOfHsgmlH9ogv5w=
cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4=
Expand Down

0 comments on commit 3eb92f1

Please sign in to comment.