Skip to content

Commit

Permalink
chore(deps): update dependency bazel_skylib to v1.5.0 (#722)
Browse files Browse the repository at this point in the history
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| bazel_skylib | bazel_dep | minor | `1.4.2` -> `1.5.0` |
| [bazel_skylib](https://togithub.com/bazelbuild/bazel-skylib) |
http_archive | minor | `1.4.2` -> `1.5.0` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-skylib (bazel_skylib)</summary>

###
[`v1.5.0`](https://togithub.com/bazelbuild/bazel-skylib/releases/tag/1.5.0)

[Compare
Source](https://togithub.com/bazelbuild/bazel-skylib/compare/1.4.2...1.5.0)

#### What's Changed

- Bump rules_pkg dep to 0.9.1 to fix build with
--incompatible_config_setting_private_default_visibility by
[@&#8203;tetromino](https://togithub.com/tetromino) in
[bazelbuild/bazel-skylib#452
- Expose int- and string-valued build settings as Make variables by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[bazelbuild/bazel-skylib#440
- Modify actions in order not to need `toolchain` param by
[@&#8203;kotlaja](https://togithub.com/kotlaja) in
[bazelbuild/bazel-skylib#455
- Fix bazel-skylib with Bazel@HEAD by
[@&#8203;meteorcloudy](https://togithub.com/meteorcloudy) in
[bazelbuild/bazel-skylib#462
- versions: Don't fail on Bazel dev builds by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[bazelbuild/bazel-skylib#463
- Add error for empty bzl_library by
[@&#8203;keith](https://togithub.com/keith) in
[bazelbuild/bazel-skylib#457
- Add `doc` param to `unittest.make` by
[@&#8203;UebelAndre](https://togithub.com/UebelAndre) in
[bazelbuild/bazel-skylib#464
- Upgrade rules_go by [@&#8203;comius](https://togithub.com/comius) in
[bazelbuild/bazel-skylib#460

#### New Contributors

- [@&#8203;kotlaja](https://togithub.com/kotlaja) made their first
contribution in
[bazelbuild/bazel-skylib#455
- [@&#8203;keith](https://togithub.com/keith) made their first
contribution in
[bazelbuild/bazel-skylib#457

**Full Changelog**:
bazelbuild/bazel-skylib@1.4.2...1.5.0

#### MODULE.bazel setup

```starlark
bazel_dep(name = "bazel_skylib", version = "1.5.0")

### If the Gazelle plugin is needed:
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
```

#### WORKSPACE setup

```starlark
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
    name = "bazel_skylib",
    sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94"
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
    ],
)

load("@&#8203;bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
```

***Additional WORKSPACE setup for the Gazelle plugin***

```starlark
http_archive(
    name = "bazel_skylib_gazelle_plugin",
    sha256 = "747addf3f508186234f6232674dd7786743efb8c68619aece5fb0cac97b8f415",
    urls = [
        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz",
        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-gazelle-plugin-1.5.0.tar.gz",
    ],
)

load("@&#8203;bazel_skylib_gazelle_plugin//:workspace.bzl", "bazel_skylib_gazelle_plugin_workspace")

bazel_skylib_gazelle_plugin_workspace()

load("@&#8203;bazel_skylib_gazelle_plugin//:setup.bzl", "bazel_skylib_gazelle_plugin_setup")

bazel_skylib_gazelle_plugin_setup()
```

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDAuMCIsInVwZGF0ZWRJblZlciI6IjM2LjEwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

---------

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
Co-authored-by: Chuck Grindel <chuck.grindel@gmail.com>
  • Loading branch information
3 people committed Nov 7, 2023
1 parent f2f91fc commit 9d2947d
Show file tree
Hide file tree
Showing 25 changed files with 24 additions and 78 deletions.
2 changes: 1 addition & 1 deletion bzlmod/workspace/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
6 changes: 3 additions & 3 deletions deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ def swift_bazel_dependencies():
maybe(
http_archive,
name = "bazel_skylib",
sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/firebase_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/http_archive_ext_deps/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(
name = "rules_swift",
version = "1.13.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/interesting_deps/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/ios_sim/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/lottie_ios_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

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

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

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.11.1")
bazel_dep(
name = "rules_swift",
Expand Down
2 changes: 1 addition & 1 deletion examples/objc_code/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/phone_number_kit/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.11.1")
bazel_dep(
name = "rules_swift",
Expand Down
2 changes: 1 addition & 1 deletion examples/pkg_manifest_minimal/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/resources_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

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

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

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "apple_support", version = "1.11.1")
bazel_dep(
name = "rules_swift",
Expand Down
2 changes: 1 addition & 1 deletion examples/soto_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/stripe_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion examples/tca_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(
name = "apple_support",
version = "1.11.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/vapor_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
9 changes: 0 additions & 9 deletions examples/vapor_example/swift/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,6 @@
"version" : "1.1.0"
}
},
{
"identity" : "swift-backtrace",
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-backtrace.git",
"state" : {
"revision" : "80746bdd0ac8a7d83aad5d89dac3cbf15de652e6",
"version" : "1.3.4"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
Expand Down
8 changes: 0 additions & 8 deletions examples/vapor_example/swift/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,6 @@ def swift_dependencies():
remote = "https://github.com/apple/swift-atomics.git",
)

# version: 1.3.4
swift_package(
name = "swiftpkg_swift_backtrace",
commit = "80746bdd0ac8a7d83aad5d89dac3cbf15de652e6",
dependencies_index = "@//swift:deps_index.json",
remote = "https://github.com/swift-server/swift-backtrace.git",
)

# version: 1.0.4
swift_package(
name = "swiftpkg_swift_collections",
Expand Down
37 changes: 0 additions & 37 deletions examples/vapor_example/swift/deps_index.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,26 +210,6 @@
"Atomics"
]
},
{
"name": "Backtrace",
"c99name": "Backtrace",
"src_type": "swift",
"label": "@swiftpkg_swift_backtrace//:Sources_Backtrace",
"package_identity": "swift-backtrace",
"product_memberships": [
"Backtrace"
]
},
{
"name": "CBacktrace",
"c99name": "CBacktrace",
"src_type": "clang",
"label": "@swiftpkg_swift_backtrace//:Sources_CBacktrace",
"package_identity": "swift-backtrace",
"product_memberships": [
"Backtrace"
]
},
{
"name": "Collections",
"c99name": "Collections",
Expand Down Expand Up @@ -1008,14 +988,6 @@
"@swiftpkg_swift_atomics//:Sources_Atomics"
]
},
{
"identity": "swift-backtrace",
"name": "Backtrace",
"type": "library",
"target_labels": [
"@swiftpkg_swift_backtrace//:Sources_Backtrace"
]
},
{
"identity": "swift-collections",
"name": "Collections",
Expand Down Expand Up @@ -1407,15 +1379,6 @@
"version": "1.1.0"
}
},
{
"name": "swiftpkg_swift_backtrace",
"identity": "swift-backtrace",
"remote": {
"commit": "80746bdd0ac8a7d83aad5d89dac3cbf15de652e6",
"remote": "https://github.com/swift-server/swift-backtrace.git",
"version": "1.3.4"
}
},
{
"name": "swiftpkg_swift_collections",
"identity": "swift-collections",
Expand Down
2 changes: 1 addition & 1 deletion examples/xcmetrics_example/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
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
Expand Down
2 changes: 1 addition & 1 deletion tools/create_example/template_files/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local_path_override(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(
name = "rules_swift",
version = "1.13.0",
Expand Down

0 comments on commit 9d2947d

Please sign in to comment.