Skip to content

Commit

Permalink
Merge branch 'main' into github-renovate/google-googlesignin-ios-7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@cgrindel
cgrindel authored Apr 3, 2024
2 parents 8137840 + 93b7443 commit b84b4d6
Show file tree
Hide file tree
Showing 22 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion bzlmod/workspace/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/firebase_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/interesting_deps/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/ios_sim/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/lottie_ios_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/messagekit_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/nimble_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/objc_code/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/phone_number_kit/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/pkg_manifest_minimal/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/resources_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/shake_ios_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/snapkit_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local_path_override(

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/soto_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/stripe_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/tca_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bazel_dep(name = "cgrindel_bazel_starlib", version = "0.20.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(
name = "apple_support",
version = "1.14.0",
version = "1.15.1",
)
bazel_dep(
name = "rules_swift",
Expand Down
2 changes: 1 addition & 1 deletion examples/vapor_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/xcmetrics_example/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")

# The apple_support bazel_dep must come before the rules_cc.
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
bazel_dep(name = "apple_support", version = "1.14.0")
bazel_dep(name = "apple_support", version = "1.15.1")
bazel_dep(
name = "rules_swift",
version = "1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/bazelbuild/buildtools v0.0.0-20231115204819-d4c9dccdfbb1
github.com/creasty/defaults v1.7.0
github.com/deckarep/golang-set/v2 v2.6.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
golang.org/x/text v0.14.0
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
go.starlark.net v0.0.0-20210223155950-e043a3d3c984/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down
8 changes: 4 additions & 4 deletions go_deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,16 @@ def swift_bazel_go_dependencies():
name = "com_github_stretchr_objx",
build_external = "external",
importpath = "github.com/stretchr/objx",
sum = "h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=",
version = "v0.5.0",
sum = "h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=",
version = "v0.5.2",
)
maybe(
go_repository,
name = "com_github_stretchr_testify",
build_external = "external",
importpath = "github.com/stretchr/testify",
sum = "h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=",
version = "v1.8.4",
sum = "h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=",
version = "v1.9.0",
)
maybe(
go_repository,
Expand Down

0 comments on commit b84b4d6

Please sign in to comment.