From 6d84ac062205f017874245c1c2421edacf6266a6 Mon Sep 17 00:00:00 2001 From: "cgrindel-app-token-generator[bot]" <96795366+cgrindel-app-token-generator[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:37:53 +0000 Subject: [PATCH 01/58] chore: update README.md for v0.40.1 (#1304) Automated update of `README.md` for release v0.40.1 This pull request was created by [cgrindel/gha_create_release](https://github.com/cgrindel/gha_create_release). Co-authored-by: cgrindel <159968+cgrindel@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2dd0adbc..ae2c420f4 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Add a dependency on `rules_swift_package_manager`. ```python -bazel_dep(name = "rules_swift_package_manager", version = "0.39.0") +bazel_dep(name = "rules_swift_package_manager", version = "0.40.1") ``` From ea812e6c9f3ae0807004462e64c680580c9115ab Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:17:36 +0000 Subject: [PATCH 02/58] chore(deps): update dependency vapor/vapor to v4.106.1 (#1301) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.0` -> `4.106.1` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.1`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.1): - Omit ACAO header instead of empty value [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.0...4.106.1) #### What's Changed Omit ACAO header instead of empty value by [@​grahamburgsma](https://redirect.github.com/grahamburgsma) in [#​3243](https://redirect.github.com/vapor/vapor/issues/3243) > *For context, Vapor currently sends an empty Access-Control-Allow-Origin (ACAO) header when the origin does not match or is set to none.* > > We recently had a pentest done against our Vapor server and the tester reported the following regarding the empty ACAO header: > > > When the header is empty, browsers might reject the request without detailed error messages, making it harder for developers to debug or even realize there is a problem. This lack of transparency can lead to extended periods of vulnerability before the issue is discovered. > > Looking at some other sources as well, an empty header doesn’t appear to be a valid value and so could result in unexpected behaviour. > > https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#the_http_response_headers > https://fetch.spec.whatwg.org/#http-access-control-allow-origin ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.0...4.106.1
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index db32b6c84..80dfed9db 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.0"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.1"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From 2770623740ce215a47b588a2d279dfae2752ae6d Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:38:01 +0000 Subject: [PATCH 03/58] chore(deps): update dependency apple/swift-nio to v2.76.1 (#1306) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [apple/swift-nio](https://redirect.github.com/apple/swift-nio) | patch | `2.76.0` -> `2.76.1` | --- ### Release Notes
apple/swift-nio (apple/swift-nio) ### [`v2.76.1`](https://redirect.github.com/apple/swift-nio/releases/tag/2.76.1): SwiftNIO 2.76.1 [Compare Source](https://redirect.github.com/apple/swift-nio/compare/2.76.0...2.76.1) #### What's Changed ##### SemVer Patch - workaround Xcode 15.4 bug with swift build --arch x86\_64 --arch arm64 by [@​weissi](https://redirect.github.com/weissi) in [https://github.com/apple/swift-nio/pull/2945](https://redirect.github.com/apple/swift-nio/pull/2945) **Full Changelog**: https://github.com/apple/swift-nio/compare/2.76.0...2.76.1
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/ios_sim/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ios_sim/Package.swift b/examples/ios_sim/Package.swift index b97912354..5f76e58b5 100644 --- a/examples/ios_sim/Package.swift +++ b/examples/ios_sim/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "ios_sim", dependencies: [ - .package(url: "https://github.com/apple/swift-nio.git", exact: "2.76.0"), + .package(url: "https://github.com/apple/swift-nio.git", exact: "2.76.1"), .package(url: "https://github.com/apple/swift-markdown.git", exact: "0.5.0"), ] ) From 1ffa4b1cc847c841b762ee4e764a6ad4f8ed40d0 Mon Sep 17 00:00:00 2001 From: Luis Padron Date: Fri, 25 Oct 2024 11:48:51 -0400 Subject: [PATCH 04/58] feat: add `swift_package_tool` generated targets (#1307) This adds a `swift_package_tool` rule which will be generated by the `swift_deps` bzlmod extension. These targets can be run using `bazel run` to update/resolve the `Package.swift`. For example: ```sh cd examples/interesting_deps bazel run @swift_package//:update bazel run @swift_package//:resolve bazel run @swift_package//:update -- GeoSwift ``` --- README.md | 49 ++++++++++ docs/bzlmod_extensions_overview.md | 21 +++- examples/firebase_example/MODULE.bazel | 1 + examples/google_maps_example/MODULE.bazel | 3 + examples/interesting_deps/MODULE.bazel | 12 +++ examples/interesting_deps/do_test | 5 +- examples/ios_sim/MODULE.bazel | 1 + examples/lottie_ios_example/MODULE.bazel | 1 + examples/messagekit_example/MODULE.bazel | 1 + examples/nimble_example/MODULE.bazel | 1 + examples/objc_code/MODULE.bazel | 1 + examples/phone_number_kit/MODULE.bazel | 1 + examples/pkg_manifest_minimal/MODULE.bazel | 1 + examples/resources_example/MODULE.bazel | 1 + examples/shake_ios_example/MODULE.bazel | 1 + examples/snapkit_example/MODULE.bazel | 1 + examples/soto_example/MODULE.bazel | 1 + examples/stripe_example/MODULE.bazel | 1 + examples/symlink_example/MODULE.bazel | 1 + examples/tca_example/MODULE.bazel | 1 + examples/vapor_example/MODULE.bazel | 1 + examples/xcmetrics_example/MODULE.bazel | 1 + swiftpkg/BUILD.bazel | 1 + swiftpkg/bzlmod/BUILD.bazel | 3 + swiftpkg/bzlmod/swift_deps.bzl | 59 ++++++++++- swiftpkg/defs.bzl | 2 + swiftpkg/internal/BUILD.bazel | 21 ++++ swiftpkg/internal/repository_utils.bzl | 20 ++++ swiftpkg/internal/swift_package_tool.bzl | 98 +++++++++++++++++++ swiftpkg/internal/swift_package_tool_repo.bzl | 58 +++++++++++ .../swift_package_tool_runner_template.sh | 54 ++++++++++ 31 files changed, 420 insertions(+), 3 deletions(-) create mode 100644 swiftpkg/internal/swift_package_tool.bzl create mode 100644 swiftpkg/internal/swift_package_tool_repo.bzl create mode 100644 swiftpkg/internal/swift_package_tool_runner_template.sh diff --git a/README.md b/README.md index ae2c420f4..59a3a8c0b 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ development inside a Bazel workspace. * [Quickstart](#quickstart) * [1. Enable bzlmod](#1-enable-bzlmod) * [2. Configure your `MODULE.bazel` to use rules_swift_package_manager.](#2-configure-your-modulebazel-to-use-rules_swift_package_manager) + * [(Optional) Use `swift_package` repository for updating packages](#optional-use-swift_package-repository-for-updating-packages) * [(Optional) Enable `swift_deps_info` generation for the Gazelle plugin](#optional-enable-swift_deps_info-generation-for-the-gazelle-plugin) * [3. Create a minimal `Package.swift` file.](#3-create-a-minimal-packageswift-file) * [4. Run `swift package update`](#4-run-swift-package-update) @@ -121,6 +122,54 @@ NOTE: Some Swift package manager features (e.g., resources) use rules from [rule dependency for `rules_swift_package_manager`. However, you do not need to declare it unless you use any of the rules in your project. +#### (Optional) Use `swift_package` repository for updating packages + +The `swift_deps` module extension will by default generate a `swift_package` repository which can be used to execute `swift package` commands. +This is useful if you'd like to control the flags and behavior of `swift package`, as well as for using the correct `swift` binary according to the Bazel configured toolchain. + +For example, to resolve the `Package.swift` file: + +```sh +bazel run @swift_package//:resolve +``` + +To update packages to their latest supported version: + +```sh +bazel run @swift_package//:update +``` + +Both targets support passing arguments as well, so for example, you could update a single package: + +```sh +bazel run @swift_package//:update -- MyPackage +``` + +These targets will update the `Package.resolved` file defined in `swift_deps.from_package`. +The targets come with default flags applied to enable the best Bazel compatibility, if you wish to configure it further, you can do so with `configure_swift_package`: + +```starlark +# MODULE.bazel + +swift_deps.configure_swift_package( + build_path = "spm-build", + cache_path = "spm-cache", + dependency_caching = "false", + manifest_cache = "none", + manifest_caching = "false", +) +``` + +If you do not want to use the `swift_package` repository you can disable it in the `swift_deps.from_package` call: + +```starlark +swift_deps.from_package( + declare_swift_package = False, # <=== Disable the `swift_package` repository + resolved = "//:Package.resolved", + swift = "//:Package.swift", +) +``` + #### (Optional) Enable `swift_deps_info` generation for the Gazelle plugin If you will be using the Gazelle plugin for Swift, you will need to enable the generation of diff --git a/docs/bzlmod_extensions_overview.md b/docs/bzlmod_extensions_overview.md index 8c0a2e2a9..4565644d6 100755 --- a/docs/bzlmod_extensions_overview.md +++ b/docs/bzlmod_extensions_overview.md @@ -17,7 +17,9 @@ On this page: swift_deps = use_extension("@rules_swift_package_manager//:extensions.bzl", "swift_deps") swift_deps.configure_package(name, init_submodules, patch_args, patch_cmds, patch_cmds_win, patch_tool, patches, recursive_init_submodules) -swift_deps.from_package(declare_swift_deps_info, resolved, swift) +swift_deps.configure_swift_package(build_path, cache_path, dependency_caching, manifest_cache, + manifest_caching) +swift_deps.from_package(declare_swift_deps_info, declare_swift_package, resolved, swift) @@ -42,6 +44,22 @@ Used to add or override settings for a particular Swift package. | patches | A list of files that are to be applied as patches after extracting the archive. By default, it uses the Bazel-native patch implementation which doesn't support fuzz match and binary patch, but Bazel will fall back to use patch command line tool if `patch_tool` attribute is specified or there are arguments other than `-p` in `patch_args` attribute. | List of labels | optional | `[]` | | recursive_init_submodules | Whether to clone submodules recursively in the repository. | Boolean | optional | `True` | + + +### configure_swift_package + +Used to configure the flags used when running the `swift package` binary. + +**Attributes** + +| Name | Description | Type | Mandatory | Default | +| :------------- | :------------- | :------------- | :------------- | :------------- | +| build_path | The relative path within the runfiles tree for the Swift Package Manager build directory. | String | optional | `".build"` | +| cache_path | The relative path within the runfiles tree for the shared Swift Package Manager cache directory. | String | optional | `".cache"` | +| dependency_caching | Whether to enable the dependency cache. | String | optional | `"true"` | +| manifest_cache | Caching mode of Package.swift manifests (shared: shared cache, local: package's build directory, none: disabled) | String | optional | `"shared"` | +| manifest_caching | Whether to enable build manifest caching. | String | optional | `"true"` | + ### from_package @@ -53,6 +71,7 @@ Load Swift packages from `Package.swift` and `Package.resolved` files. | Name | Description | Type | Mandatory | Default | | :------------- | :------------- | :------------- | :------------- | :------------- | | declare_swift_deps_info | Declare a `swift_deps_info` repository that is used by external tooling (e.g. Swift Gazelle plugin). | Boolean | optional | `False` | +| declare_swift_package | Declare a `swift_package_tool` repository named `swift_package` which defines two targets: `update` and `resolve`. These targets run can be used to run the `swift package` binary in a Bazel context. The flags used when running the underlying `swift package` can be configured using the `configure_swift_package` tag.

They can be `bazel run` to update/resolve the `resolved` file:

bazel run @swift_package//:update
bazel run @swift_package//:resolve
| Boolean | optional | `True` | | resolved | A `Package.resolved`. | Label | optional | `None` | | swift | A `Package.swift`. | Label | required | | diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 04df47574..2b91f2eeb 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -59,6 +59,7 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_firebase_ios_sdk", "swiftpkg_reachability.swift", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index b32069811..8705c56f6 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -43,8 +43,11 @@ swift_deps = use_extension( "@rules_swift_package_manager//:extensions.bzl", "swift_deps", ) + +# Example showing that `swift_package` repo can be disabled. swift_deps.from_package( declare_swift_deps_info = True, + declare_swift_package = False, resolved = "//:Package.resolved", swift = "//:Package.swift", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index 51d8c9c25..31e218d8c 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -51,9 +51,21 @@ swift_deps.from_package( resolved = "//:Package.resolved", swift = "//:Package.swift", ) + +# Example showing customization of the `swift_package` repo tool. +# To resolve: `bazel run @swift_package//:resolve` +# To update: `bazel run @swift_package//:update` +swift_deps.configure_swift_package( + build_path = "spm-build", + cache_path = "spm-cache", + dependency_caching = "false", + manifest_cache = "none", + manifest_caching = "false", +) use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_cocoalumberjack", "swiftpkg_geoswift", "swiftpkg_libwebp_xcode", diff --git a/examples/interesting_deps/do_test b/examples/interesting_deps/do_test index bf114c0d8..903dbf5f4 100755 --- a/examples/interesting_deps/do_test +++ b/examples/interesting_deps/do_test @@ -2,12 +2,15 @@ set -o errexit -o nounset -o pipefail -# Use the Bazel binary specified by the integration test. Otherise, fall back +# Use the Bazel binary specified by the integration test. Otherise, fall back # to bazel. bazel="${BIT_BAZEL_BINARY:-bazel}" # Generate Swift external deps and update build files "${bazel}" run //:tidy +# Test resolving the package via the `swift_package` repo. +"${bazel}" run @swift_package//:resolve + # Ensure that it builds and tests pass "${bazel}" test //... diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 67683ea72..b1d79ca69 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -66,6 +66,7 @@ swift_deps.configure_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_swift_markdown", "swiftpkg_swift_nio", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index c70d9cafb..580659f29 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -51,5 +51,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_lottie_spm", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 80864cb24..41df89ef4 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -51,6 +51,7 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_kingfisher", "swiftpkg_messagekit", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index a3ceef933..913af88f4 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -51,6 +51,7 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_nimble", "swiftpkg_quick", ) diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index e7943cd5a..61fb28529 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -54,5 +54,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_trustkit", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index e7d715098..d81c855d3 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -51,5 +51,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_phonenumberkit", ) diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index f7067e75b..e4f161bdf 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -49,6 +49,7 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_my_local_package", "swiftpkg_notthatamazingmodule", "swiftpkg_swift_argument_parser", diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 19a65c274..814ff3323 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -49,6 +49,7 @@ swift_deps.from_package( ) use_repo( swift_deps, + "swift_package", "swiftpkg_another_package_with_resources", "swiftpkg_app_lovin_sdk", "swiftpkg_googlesignin_ios", diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 60c1742bc..e5f41cc35 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -51,5 +51,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_shake_ios", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 8f8d32532..d918a89c1 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -51,5 +51,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_snapkit", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 007d715ca..33fd1b1f4 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -54,5 +54,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_soto", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index f0d9bf3d7..34d159781 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -54,5 +54,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_stripe_ios", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index d0d7c88c8..27925b707 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -50,5 +50,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_empty_framework", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index ce187e3c2..db9cb7cc1 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -54,5 +54,6 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_swift_composable_architecture", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index c97b0aa03..535b5a919 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -54,6 +54,7 @@ swift_deps.from_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_fluent", "swiftpkg_fluent_sqlite_driver", "swiftpkg_vapor", diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index d1885a498..b91f80801 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -70,5 +70,6 @@ swift_deps.configure_package( use_repo( swift_deps, "swift_deps_info", + "swift_package", "swiftpkg_xcmetrics", ) diff --git a/swiftpkg/BUILD.bazel b/swiftpkg/BUILD.bazel index 9545db478..86852ce4a 100644 --- a/swiftpkg/BUILD.bazel +++ b/swiftpkg/BUILD.bazel @@ -13,6 +13,7 @@ bzl_library( "//swiftpkg/internal:swift_deps_index", "//swiftpkg/internal:swift_deps_info", "//swiftpkg/internal:swift_package", + "//swiftpkg/internal:swift_package_tool", ], ) diff --git a/swiftpkg/bzlmod/BUILD.bazel b/swiftpkg/bzlmod/BUILD.bazel index 7ca7f8bf3..2aa85d703 100644 --- a/swiftpkg/bzlmod/BUILD.bazel +++ b/swiftpkg/bzlmod/BUILD.bazel @@ -17,7 +17,10 @@ bzl_library( "//swiftpkg/internal:bazel_repo_names", "//swiftpkg/internal:local_swift_package", "//swiftpkg/internal:pkginfos", + "//swiftpkg/internal:repository_utils", "//swiftpkg/internal:swift_deps_info", "//swiftpkg/internal:swift_package", + "//swiftpkg/internal:swift_package_tool", + "//swiftpkg/internal:swift_package_tool_repo", ], ) diff --git a/swiftpkg/bzlmod/swift_deps.bzl b/swiftpkg/bzlmod/swift_deps.bzl index b852abc26..c5c83465b 100644 --- a/swiftpkg/bzlmod/swift_deps.bzl +++ b/swiftpkg/bzlmod/swift_deps.bzl @@ -3,20 +3,24 @@ load("//swiftpkg/internal:bazel_repo_names.bzl", "bazel_repo_names") load("//swiftpkg/internal:local_swift_package.bzl", "local_swift_package") load("//swiftpkg/internal:pkginfos.bzl", "pkginfos") +load("//swiftpkg/internal:repository_utils.bzl", "repository_utils") load("//swiftpkg/internal:swift_deps_info.bzl", "swift_deps_info") load("//swiftpkg/internal:swift_package.bzl", "PATCH_ATTRS", "swift_package") +load("//swiftpkg/internal:swift_package_tool.bzl", "SWIFT_PACKAGE_CONFIG_ATTRS") +load("//swiftpkg/internal:swift_package_tool_repo.bzl", "swift_package_tool_repo") # MARK: - swift_deps bzlmod Extension _DO_WHILE_RANGE = range(1000) -def _declare_pkgs_from_package(module_ctx, from_package, config_pkgs): +def _declare_pkgs_from_package(module_ctx, from_package, config_pkgs, config_swift_package): """Declare Swift packages from `Package.swift` and `Package.resolved`. Args: module_ctx: An instance of `module_ctx`. from_package: The data from the `from_package` tag. config_pkgs: The data from the `configure_package` tag. + config_swift_package: The data from the `configure_swift_package` tag. """ # Read Package.resolved. @@ -75,6 +79,15 @@ the Swift package to make it available.\ ) direct_dep_repo_names.append(swift_deps_info_repo_name) + if from_package.declare_swift_package: + swift_package_repo_name = "swift_package" + _declare_swift_package_repo( + name = swift_package_repo_name, + from_package = from_package, + config_swift_package = config_swift_package, + ) + direct_dep_repo_names.append(swift_package_repo_name) + # Ensure that we add all of the transitive source control deps from the # resolved file. for pin_map in resolved_pkg_map.get("pins", []): @@ -183,11 +196,30 @@ def _declare_pkg_from_dependency(dep, config_pkg): dependencies_index = None, ) +def _declare_swift_package_repo(name, from_package, config_swift_package): + config_swift_package_kwargs = repository_utils.struct_to_kwargs( + struct = config_swift_package, + keys = SWIFT_PACKAGE_CONFIG_ATTRS, + ) + + swift_package_tool_repo( + name = name, + package = "{package}/{name}".format( + package = from_package.swift.package, + name = from_package.swift.name, + ), + **config_swift_package_kwargs + ) + def _swift_deps_impl(module_ctx): config_pkgs = {} for mod in module_ctx.modules: for config_pkg in mod.tags.configure_package: config_pkgs[config_pkg.name] = config_pkg + config_swift_package = None + for mod in module_ctx.modules: + for config_swift_package in mod.tags.configure_swift_package: + config_swift_package = config_swift_package direct_dep_repo_names = [] for mod in module_ctx.modules: for from_package in mod.tags.from_package: @@ -196,6 +228,7 @@ def _swift_deps_impl(module_ctx): module_ctx, from_package, config_pkgs, + config_swift_package, ), ) return module_ctx.extension_metadata( @@ -209,6 +242,24 @@ _from_package_tag = tag_class( doc = """\ Declare a `swift_deps_info` repository that is used by external tooling (e.g. \ Swift Gazelle plugin).\ +""", + ), + "declare_swift_package": attr.bool( + default = True, + doc = """\ +Declare a `swift_package_tool` repository named `swift_package` which defines two targets: +`update` and `resolve`.\ + +These targets run can be used to run the `swift package` binary in a Bazel context. +The flags used when running the underlying `swift package` can be configured \ +using the `configure_swift_package` tag. + +They can be `bazel run` to update/resolve the `resolved` file: + +``` +bazel run @swift_package//:update +bazel run @swift_package//:resolve +``` """, ), "resolved": attr.label( @@ -244,10 +295,16 @@ The identity (i.e., name in the package's manifest) for the Swift package.\ doc = "Used to add or override settings for a particular Swift package.", ) +_configure_swift_package_tag = tag_class( + attrs = SWIFT_PACKAGE_CONFIG_ATTRS, + doc = "Used to configure the flags used when running the `swift package` binary.", +) + swift_deps = module_extension( implementation = _swift_deps_impl, tag_classes = { "configure_package": _configure_package_tag, + "configure_swift_package": _configure_swift_package_tag, "from_package": _from_package_tag, }, ) diff --git a/swiftpkg/defs.bzl b/swiftpkg/defs.bzl index 45d3cd0ac..0483d66e1 100644 --- a/swiftpkg/defs.bzl +++ b/swiftpkg/defs.bzl @@ -4,6 +4,7 @@ load("//swiftpkg/internal:local_swift_package.bzl", _local_swift_package = "loca load("//swiftpkg/internal:swift_deps_index.bzl", _swift_deps_index = "swift_deps_index") load("//swiftpkg/internal:swift_deps_info.bzl", _swift_deps_info = "swift_deps_info") load("//swiftpkg/internal:swift_package.bzl", _swift_package = "swift_package") +load("//swiftpkg/internal:swift_package_tool.bzl", _swift_package_tool = "swift_package_tool") # Repository rules swift_package = _swift_package @@ -12,3 +13,4 @@ swift_deps_info = _swift_deps_info # Rules swift_deps_index = _swift_deps_index +swift_package_tool = _swift_package_tool diff --git a/swiftpkg/internal/BUILD.bazel b/swiftpkg/internal/BUILD.bazel index fb4233164..b21d05f06 100644 --- a/swiftpkg/internal/BUILD.bazel +++ b/swiftpkg/internal/BUILD.bazel @@ -297,6 +297,27 @@ bzl_library( ], ) +bzl_library( + name = "swift_package_tool", + srcs = ["swift_package_tool.bzl"], + visibility = ["//swiftpkg:__subpackages__"], + deps = [ + "@bazel_skylib//lib:dicts", + "@bazel_skylib//lib:paths", + "@build_bazel_rules_swift//swift", + ], +) + +bzl_library( + name = "swift_package_tool_repo", + srcs = ["swift_package_tool_repo.bzl"], + visibility = ["//swiftpkg:__subpackages__"], + deps = [ + ":repository_utils", + "@bazel_skylib//lib:dicts", + ], +) + bzl_library( name = "bazel_repo_names", srcs = ["bazel_repo_names.bzl"], diff --git a/swiftpkg/internal/repository_utils.bzl b/swiftpkg/internal/repository_utils.bzl index 538dc14cb..1dad0607a 100644 --- a/swiftpkg/internal/repository_utils.bzl +++ b/swiftpkg/internal/repository_utils.bzl @@ -107,9 +107,29 @@ def _package_name(repository_ctx): return repository_ctx.attr.bazel_package_name return repository_ctx.name +def _struct_to_kwargs(*, struct, keys): + """Convert a struct to a kwargs dict, where the keys are the struct's attrs and the values are the struct's values. + + Example: given a struct like: `struct(a = "foo", b = "bar")` and keys `["a"]`, the result will be `{"a": "foo"}`. + + Args: + struct: The struct to convert. + keys: The keys to include in the kwargs dict. + + Returns: + A kwargs dict. + """ + kwargs = {} + for k in keys: + v = getattr(struct, k, None) + if v != None: + kwargs[k] = v + return kwargs + repository_utils = struct( exec_spm_command = _execute_spm_command, is_macos = _is_macos, package_name = _package_name, parsed_json_from_spm_command = _parsed_json_from_spm_command, + struct_to_kwargs = _struct_to_kwargs, ) diff --git a/swiftpkg/internal/swift_package_tool.bzl b/swiftpkg/internal/swift_package_tool.bzl new file mode 100644 index 000000000..c5d8896da --- /dev/null +++ b/swiftpkg/internal/swift_package_tool.bzl @@ -0,0 +1,98 @@ +"""Implementation for the `swift_package_tool` rule used by the `swift_deps` bzlmod extension.""" + +load("@bazel_skylib//lib:dicts.bzl", "dicts") +load("@bazel_skylib//lib:paths.bzl", "paths") +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_common") + +# The name of the runner script. +_RUNNER_SCRIPT_NAME = "swift_package.sh" + +def _swift_package_tool_impl(ctx): + build_path = ctx.attr.build_path + cache_path = ctx.attr.cache_path + cmd = ctx.attr.cmd + package = ctx.attr.package + package_path = paths.dirname(package) + + toolchain = swift_common.get_toolchain(ctx) + swift = toolchain.swift_worker + + runner_script = ctx.actions.declare_file(_RUNNER_SCRIPT_NAME) + template_dict = ctx.actions.template_dict() + template_dict.add("%(swift_worker)s", swift.executable.short_path) + template_dict.add("%(cmd)s", cmd) + template_dict.add("%(package_path)s", package_path) + template_dict.add("%(build_path)s", build_path) + template_dict.add("%(cache_path)s", cache_path) + template_dict.add("%(enable_build_manifest_caching)s", ctx.attr.manifest_caching) + template_dict.add("%(enable_dependency_cache)s", ctx.attr.dependency_caching) + template_dict.add("%(manifest_cache)s", ctx.attr.manifest_cache) + + ctx.actions.expand_template( + template = ctx.file._runner_template, + is_executable = True, + output = runner_script, + computed_substitutions = template_dict, + ) + + return [ + DefaultInfo( + executable = runner_script, + files = depset([runner_script]), + runfiles = ctx.runfiles(files = [swift.executable]), + ), + ] + +SWIFT_PACKAGE_CONFIG_ATTRS = { + "build_path": attr.string( + doc = "The relative path within the runfiles tree for the Swift Package Manager build directory.", + default = ".build", + ), + "cache_path": attr.string( + doc = "The relative path within the runfiles tree for the shared Swift Package Manager cache directory.", + default = ".cache", + ), + "dependency_caching": attr.string( + doc = "Whether to enable the dependency cache.", + default = "true", + values = ["true", "false"], + ), + "manifest_cache": attr.string( + doc = """Caching mode of Package.swift manifests \ +(shared: shared cache, local: package's build directory, none: disabled) +""", + default = "shared", + values = ["shared", "local", "none"], + ), + "manifest_caching": attr.string( + doc = "Whether to enable build manifest caching.", + default = "true", + values = ["true", "false"], + ), +} + +swift_package_tool = rule( + implementation = _swift_package_tool_impl, + doc = "Defines a rule that can be used to execute the `swift package` tool.", + attrs = dicts.add( + swift_common.toolchain_attrs(), + { + "cmd": attr.string( + doc = "The `swift package` command to execute.", + mandatory = True, + values = ["update", "resolve"], + ), + "package": attr.string( + doc = "The relative path to the `Package.swift` file from the workspace root.", + mandatory = True, + ), + "_runner_template": attr.label( + doc = "The template for the runner script.", + allow_single_file = True, + default = Label("//swiftpkg/internal:swift_package_tool_runner_template.sh"), + ), + }, + SWIFT_PACKAGE_CONFIG_ATTRS, + ), + executable = True, +) diff --git a/swiftpkg/internal/swift_package_tool_repo.bzl b/swiftpkg/internal/swift_package_tool_repo.bzl new file mode 100644 index 000000000..54403dcd9 --- /dev/null +++ b/swiftpkg/internal/swift_package_tool_repo.bzl @@ -0,0 +1,58 @@ +"""Defines the `swift_package_tool_repo` repository rule that creates `swift_package_tool` targets.""" + +load("@bazel_skylib//lib:dicts.bzl", "dicts") +load("//swiftpkg/internal:repository_utils.bzl", "repository_utils") +load("//swiftpkg/internal:swift_package_tool.bzl", "SWIFT_PACKAGE_CONFIG_ATTRS") + +def _swift_package_tool_repo_impl(repository_ctx): + package_path = repository_ctx.attr.package + + # Construct the list of keyword arguments for the `swift_package_tool` rule. + # String should be "key = \"value\"" + # NOTE: only supports string typed values as they are all quoted + kwargs = repository_utils.struct_to_kwargs( + struct = repository_ctx.attr, + keys = SWIFT_PACKAGE_CONFIG_ATTRS, + ) + kwarg_content = ",\n".join([ + " {key} = \"{value}\"".format(key = k, value = v) + for k, v in kwargs.items() + ]) + + repository_ctx.file( + "BUILD.bazel", + content = """ +load("@rules_swift_package_manager//swiftpkg:defs.bzl", "swift_package_tool") + +swift_package_tool( + name = "update", + cmd = "update", + package = "{package}", +{kwarg_content} +) + +swift_package_tool( + name = "resolve", + cmd = "resolve", + package = "{package}", +{kwarg_content} +) +""".format( + package = package_path, + kwarg_content = kwarg_content, + ), + ) + +swift_package_tool_repo = repository_rule( + implementation = _swift_package_tool_repo_impl, + attrs = dicts.add( + { + "package": attr.string( + doc = "The relative path to the `Package.swift` file to operate on.", + mandatory = True, + ), + }, + SWIFT_PACKAGE_CONFIG_ATTRS, + ), + doc = "Declares a `@swift_package` repository for using the `swift_package_tool` targets.", +) diff --git a/swiftpkg/internal/swift_package_tool_runner_template.sh b/swiftpkg/internal/swift_package_tool_runner_template.sh new file mode 100644 index 000000000..0fe61cc94 --- /dev/null +++ b/swiftpkg/internal/swift_package_tool_runner_template.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +set -euo pipefail + +# +# This is a templated script which runs `swift package `. +# +# The expected template keys are: +# %(swift_worker)s - The path to the Swift worker executable. +# %(cmd)s - The command to run. +# %(package)s - The path to the package to run the command on. +# %(build_path)s - The path to the build directory. +# %(cache_path)s - The path to the cache directory. + +if [ -z "${BUILD_WORKSPACE_DIRECTORY:-}" ]; then + echo "BUILD_WORKSPACE_DIRECTORY is not set, this target may only be \`bazel run\`" + exit 1 +fi + +# Collect template values. +swift_worker="%(swift_worker)s" +cmd="%(cmd)s" +package_path="$BUILD_WORKSPACE_DIRECTORY/%(package_path)s" +build_path="%(build_path)s" +cache_path="%(cache_path)s" +enable_build_manifest_caching="%(enable_build_manifest_caching)s" +enable_dependency_cache="%(enable_dependency_cache)s" +manifest_cache="%(manifest_cache)s" + +# Construct dynamic arguments. +args=() + +if [ "$enable_build_manifest_caching" = "true" ]; then + args+=("--enable-build-manifest-caching") +else + args+=("--disable-build-manifest-caching") +fi + +if [ "$enable_dependency_cache" = "true" ]; then + args+=("--enable-dependency-cache") +else + args+=("--disable-dependency-cache") +fi + +args+=("--manifest-cache=$manifest_cache") + +# Run the command. +"$swift_worker" swift package \ + --package-path "$package_path" \ + --build-path "$build_path" \ + --cache-path "$cache_path" \ + "$cmd" \ + "${args[@]}" \ + "$@" From e9b47f759c309365d56e86e7d1c1438591b2dd28 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:34:21 -0600 Subject: [PATCH 05/58] chore(deps): update dependency shakebugs/shake-ios to from: "17.0.2" (#1312) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [shakebugs/shake-ios](https://redirect.github.com/shakebugs/shake-ios) | patch | `from: "17.0.1"` -> `from: "17.0.2"` | --- ### Release Notes
shakebugs/shake-ios (shakebugs/shake-ios) ### [`v17.0.2`](https://redirect.github.com/shakebugs/shake-ios/compare/17.0.1...17.0.2) [Compare Source](https://redirect.github.com/shakebugs/shake-ios/compare/17.0.1...17.0.2)
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/shake_ios_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/shake_ios_example/Package.swift b/examples/shake_ios_example/Package.swift index 61bcd0070..4d05d2f15 100644 --- a/examples/shake_ios_example/Package.swift +++ b/examples/shake_ios_example/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "shake_ios_example", dependencies: [ - .package(url: "https://github.com/shakebugs/shake-ios", from: "17.0.1"), + .package(url: "https://github.com/shakebugs/shake-ios", from: "17.0.2"), ] ) From bff297a7671a1a324b65e2f8db76df8eb9edb6ff Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:06:21 +0000 Subject: [PATCH 06/58] chore(deps): update dependency rules_swift to v2.2.2 (#1310) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_swift | bazel_dep | patch | `2.2.1` -> `2.2.2` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel --- bzlmod/workspace/MODULE.bazel | 2 +- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/interesting_deps/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/objc_code/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/pkg_manifest_minimal/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- examples/xcmetrics_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel index 987a6bac5..ba03e5907 100644 --- a/bzlmod/workspace/MODULE.bazel +++ b/bzlmod/workspace/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 2b91f2eeb..bb0628710 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index 8705c56f6..c62fc2e07 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index c5c79d4af..4319aaa52 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index c5c79d4af..4319aaa52 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index 31e218d8c..6bcf1e8f4 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index b1d79ca69..031691fd5 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 580659f29..80d07b591 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 41df89ef4..eb8213646 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index 913af88f4..fdfc6c831 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index 61fb28529..27c74e6fc 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index d81c855d3..b051e63f6 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index e4f161bdf..9381f021d 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 814ff3323..7c39e1978 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index e5f41cc35..29c11d88d 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index d918a89c1..75f89a675 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 33fd1b1f4..7215f61cb 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 34d159781..085fbeb9d 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 27925b707..bffee7e6a 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index db9cb7cc1..8855f4935 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep( ) bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 535b5a919..436b4e5fe 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index b91f80801..99bdfe792 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index ffd380c3e..75e0ab28c 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.1", + version = "2.2.2", repo_name = "build_bazel_rules_swift", ) bazel_dep( From ca8e0adc663ac42bd192b5c63012b2040a5d66bc Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:20:58 -0600 Subject: [PATCH 07/58] chore(deps): update dependency rules_xcodeproj to v2.8.0 (#1313) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_xcodeproj | bazel_dep | minor | `2.7.0` -> `2.8.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index bb0628710..356b87448 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( bazel_dep( name = "rules_xcodeproj", - version = "2.7.0", + version = "2.8.0", dev_dependency = True, ) bazel_dep( diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 031691fd5..acf35c41d 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -37,7 +37,7 @@ bazel_dep( ) bazel_dep( name = "rules_xcodeproj", - version = "2.7.0", + version = "2.8.0", dev_dependency = True, ) From ba2585cdbe1a6ee501c2305011fc42d495e9ff85 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:45:21 +0000 Subject: [PATCH 08/58] chore(deps): update dependency rules_apple to v3.10.0 (#1311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_apple | bazel_dep | minor | `3.9.2` -> `3.10.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 356b87448..56abe6dbc 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index c62fc2e07..abb5d947b 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 4319aaa52..9107e350e 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 4319aaa52..9107e350e 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index acf35c41d..e75736543 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 80d07b591..2f96d1252 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index eb8213646..ec0760920 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index fdfc6c831..e9ec7b525 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index b051e63f6..349bc4f09 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 7c39e1978..0b11ecf76 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 29c11d88d..c43248b89 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 75f89a675..75c010aa5 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 7215f61cb..5de5d59df 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 085fbeb9d..282c3d068 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index bffee7e6a..71f30d30b 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index 8855f4935..5963c8438 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 436b4e5fe..a8c68b9f7 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 75e0ab28c..b9cdbf9d0 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.9.2", + version = "3.10.0", repo_name = "build_bazel_rules_apple", ) From 5673b8ae2bb6977ed807ca89b11b85f0770c7b1b Mon Sep 17 00:00:00 2001 From: Luis Padron Date: Wed, 30 Oct 2024 10:42:33 -0400 Subject: [PATCH 09/58] feat: support non-string attrs in swift_package_tool (#1316) Sort of missed doing this in #1307 but it provides a nicer interface for users and will support the `dict` attr for the upcoming Swift Package Registry support. --- docs/bzlmod_extensions_overview.md | 4 +- examples/interesting_deps/MODULE.bazel | 4 +- swiftpkg/internal/swift_package_tool.bzl | 14 +++---- swiftpkg/internal/swift_package_tool_repo.bzl | 39 ++++++++++++------- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/docs/bzlmod_extensions_overview.md b/docs/bzlmod_extensions_overview.md index 4565644d6..d6632c87c 100755 --- a/docs/bzlmod_extensions_overview.md +++ b/docs/bzlmod_extensions_overview.md @@ -56,9 +56,9 @@ Used to configure the flags used when running the `swift package` binary. | :------------- | :------------- | :------------- | :------------- | :------------- | | build_path | The relative path within the runfiles tree for the Swift Package Manager build directory. | String | optional | `".build"` | | cache_path | The relative path within the runfiles tree for the shared Swift Package Manager cache directory. | String | optional | `".cache"` | -| dependency_caching | Whether to enable the dependency cache. | String | optional | `"true"` | +| dependency_caching | Whether to enable the dependency cache. | Boolean | optional | `True` | | manifest_cache | Caching mode of Package.swift manifests (shared: shared cache, local: package's build directory, none: disabled) | String | optional | `"shared"` | -| manifest_caching | Whether to enable build manifest caching. | String | optional | `"true"` | +| manifest_caching | Whether to enable build manifest caching. | Boolean | optional | `True` | diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index 6bcf1e8f4..f765e1775 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -58,9 +58,9 @@ swift_deps.from_package( swift_deps.configure_swift_package( build_path = "spm-build", cache_path = "spm-cache", - dependency_caching = "false", + dependency_caching = False, manifest_cache = "none", - manifest_caching = "false", + manifest_caching = False, ) use_repo( swift_deps, diff --git a/swiftpkg/internal/swift_package_tool.bzl b/swiftpkg/internal/swift_package_tool.bzl index c5d8896da..1f2ea1f74 100644 --- a/swiftpkg/internal/swift_package_tool.bzl +++ b/swiftpkg/internal/swift_package_tool.bzl @@ -24,8 +24,8 @@ def _swift_package_tool_impl(ctx): template_dict.add("%(package_path)s", package_path) template_dict.add("%(build_path)s", build_path) template_dict.add("%(cache_path)s", cache_path) - template_dict.add("%(enable_build_manifest_caching)s", ctx.attr.manifest_caching) - template_dict.add("%(enable_dependency_cache)s", ctx.attr.dependency_caching) + template_dict.add("%(enable_build_manifest_caching)s", "true" if ctx.attr.manifest_caching else "false") + template_dict.add("%(enable_dependency_cache)s", "true" if ctx.attr.dependency_caching else "false") template_dict.add("%(manifest_cache)s", ctx.attr.manifest_cache) ctx.actions.expand_template( @@ -52,10 +52,9 @@ SWIFT_PACKAGE_CONFIG_ATTRS = { doc = "The relative path within the runfiles tree for the shared Swift Package Manager cache directory.", default = ".cache", ), - "dependency_caching": attr.string( + "dependency_caching": attr.bool( doc = "Whether to enable the dependency cache.", - default = "true", - values = ["true", "false"], + default = True, ), "manifest_cache": attr.string( doc = """Caching mode of Package.swift manifests \ @@ -64,10 +63,9 @@ SWIFT_PACKAGE_CONFIG_ATTRS = { default = "shared", values = ["shared", "local", "none"], ), - "manifest_caching": attr.string( + "manifest_caching": attr.bool( doc = "Whether to enable build manifest caching.", - default = "true", - values = ["true", "false"], + default = True, ), } diff --git a/swiftpkg/internal/swift_package_tool_repo.bzl b/swiftpkg/internal/swift_package_tool_repo.bzl index 54403dcd9..037fe7bd1 100644 --- a/swiftpkg/internal/swift_package_tool_repo.bzl +++ b/swiftpkg/internal/swift_package_tool_repo.bzl @@ -1,23 +1,34 @@ """Defines the `swift_package_tool_repo` repository rule that creates `swift_package_tool` targets.""" load("@bazel_skylib//lib:dicts.bzl", "dicts") +load("@bazel_skylib//lib:types.bzl", "types") load("//swiftpkg/internal:repository_utils.bzl", "repository_utils") load("//swiftpkg/internal:swift_package_tool.bzl", "SWIFT_PACKAGE_CONFIG_ATTRS") -def _swift_package_tool_repo_impl(repository_ctx): - package_path = repository_ctx.attr.package - - # Construct the list of keyword arguments for the `swift_package_tool` rule. - # String should be "key = \"value\"" - # NOTE: only supports string typed values as they are all quoted +def _package_config_attrs_to_content(attrs): + """Returns a BUILD file compatible string representation of the keyword arguments""" kwargs = repository_utils.struct_to_kwargs( - struct = repository_ctx.attr, + struct = attrs, keys = SWIFT_PACKAGE_CONFIG_ATTRS, ) - kwarg_content = ",\n".join([ - " {key} = \"{value}\"".format(key = k, value = v) - for k, v in kwargs.items() - ]) + + kwarg_lines = [] + for k, v in kwargs.items(): + if types.is_string(v): + kwarg_lines.append(" {key} = \"{value}\"".format(key = k, value = v)) + elif types.is_bool(v): + kwarg_lines.append(" {key} = {value}".format(key = k, value = "True" if v else "False")) + elif types.is_dict(v): + json_str = json.encode(v) + kwarg_lines.append(" {key} = {value}".format(key = k, value = json_str)) + else: + fail("Unsupported value type for attribute {key}: {value}".format(key = k, value = v)) + + return ",\n".join(kwarg_lines) + +def _swift_package_tool_repo_impl(repository_ctx): + attrs_content = _package_config_attrs_to_content(repository_ctx.attr) + package_path = repository_ctx.attr.package repository_ctx.file( "BUILD.bazel", @@ -28,18 +39,18 @@ swift_package_tool( name = "update", cmd = "update", package = "{package}", -{kwarg_content} +{attrs_content} ) swift_package_tool( name = "resolve", cmd = "resolve", package = "{package}", -{kwarg_content} +{attrs_content} ) """.format( package = package_path, - kwarg_content = kwarg_content, + attrs_content = attrs_content, ), ) From d15b8aeaf25854d05018161e4ca0fc86b577beb7 Mon Sep 17 00:00:00 2001 From: Luis Padron Date: Wed, 30 Oct 2024 13:00:23 -0400 Subject: [PATCH 10/58] feat: set a default `--security-path` for swift_package_tool (#1317) Add support for setting a custom `--security-path`. This also ensures the global path is not used. Co-authored-by: Brentley Jones --- docs/bzlmod_extensions_overview.md | 3 ++- examples/interesting_deps/MODULE.bazel | 1 + swiftpkg/internal/swift_package_tool.bzl | 5 +++++ swiftpkg/internal/swift_package_tool_runner_template.sh | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/bzlmod_extensions_overview.md b/docs/bzlmod_extensions_overview.md index d6632c87c..ae15d0303 100755 --- a/docs/bzlmod_extensions_overview.md +++ b/docs/bzlmod_extensions_overview.md @@ -18,7 +18,7 @@ swift_deps = use_extension("@rules_swift_package_manager//:extensions.bzl", "swi swift_deps.configure_package(name, init_submodules, patch_args, patch_cmds, patch_cmds_win, patch_tool, patches, recursive_init_submodules) swift_deps.configure_swift_package(build_path, cache_path, dependency_caching, manifest_cache, - manifest_caching) + manifest_caching, security_path) swift_deps.from_package(declare_swift_deps_info, declare_swift_package, resolved, swift) @@ -59,6 +59,7 @@ Used to configure the flags used when running the `swift package` binary. | dependency_caching | Whether to enable the dependency cache. | Boolean | optional | `True` | | manifest_cache | Caching mode of Package.swift manifests (shared: shared cache, local: package's build directory, none: disabled) | String | optional | `"shared"` | | manifest_caching | Whether to enable build manifest caching. | Boolean | optional | `True` | +| security_path | The relative path within the runfiles tree for the security directory. | String | optional | `".security"` | diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index f765e1775..d55e2ff56 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -61,6 +61,7 @@ swift_deps.configure_swift_package( dependency_caching = False, manifest_cache = "none", manifest_caching = False, + security_path = "spm-security", ) use_repo( swift_deps, diff --git a/swiftpkg/internal/swift_package_tool.bzl b/swiftpkg/internal/swift_package_tool.bzl index 1f2ea1f74..aaab9c878 100644 --- a/swiftpkg/internal/swift_package_tool.bzl +++ b/swiftpkg/internal/swift_package_tool.bzl @@ -27,6 +27,7 @@ def _swift_package_tool_impl(ctx): template_dict.add("%(enable_build_manifest_caching)s", "true" if ctx.attr.manifest_caching else "false") template_dict.add("%(enable_dependency_cache)s", "true" if ctx.attr.dependency_caching else "false") template_dict.add("%(manifest_cache)s", ctx.attr.manifest_cache) + template_dict.add("%(security_path)s", ctx.attr.security_path) ctx.actions.expand_template( template = ctx.file._runner_template, @@ -67,6 +68,10 @@ SWIFT_PACKAGE_CONFIG_ATTRS = { doc = "Whether to enable build manifest caching.", default = True, ), + "security_path": attr.string( + doc = "The relative path within the runfiles tree for the security directory.", + default = ".security", + ), } swift_package_tool = rule( diff --git a/swiftpkg/internal/swift_package_tool_runner_template.sh b/swiftpkg/internal/swift_package_tool_runner_template.sh index 0fe61cc94..f2e810920 100644 --- a/swiftpkg/internal/swift_package_tool_runner_template.sh +++ b/swiftpkg/internal/swift_package_tool_runner_template.sh @@ -26,6 +26,7 @@ cache_path="%(cache_path)s" enable_build_manifest_caching="%(enable_build_manifest_caching)s" enable_dependency_cache="%(enable_dependency_cache)s" manifest_cache="%(manifest_cache)s" +security_path="%(security_path)s" # Construct dynamic arguments. args=() @@ -46,9 +47,10 @@ args+=("--manifest-cache=$manifest_cache") # Run the command. "$swift_worker" swift package \ - --package-path "$package_path" \ --build-path "$build_path" \ --cache-path "$cache_path" \ + --package-path "$package_path" \ + --security-path "$security_path" \ "$cmd" \ "${args[@]}" \ "$@" From b44bad182e1bd3226dd76f5c59e94b48328068ee Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:27:40 +0000 Subject: [PATCH 11/58] chore(deps): update dependency rules_xcodeproj to v2.8.1 (#1314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_xcodeproj | bazel_dep | patch | `2.8.0` -> `2.8.1` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 56abe6dbc..a932d63d7 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( bazel_dep( name = "rules_xcodeproj", - version = "2.8.0", + version = "2.8.1", dev_dependency = True, ) bazel_dep( diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index e75736543..71708d164 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -37,7 +37,7 @@ bazel_dep( ) bazel_dep( name = "rules_xcodeproj", - version = "2.8.0", + version = "2.8.1", dev_dependency = True, ) From 1bc0a855b07033f391753ed2327139251976ae43 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:46:36 +0000 Subject: [PATCH 12/58] chore(deps): update dependency rules_apple to v3.11.2 (#1315) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_apple | bazel_dep | minor | `3.10.0` -> `3.11.2` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index a932d63d7..30b4b9336 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index abb5d947b..f6d8ca3cb 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 9107e350e..f6827e0a8 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 9107e350e..f6827e0a8 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 71708d164..27c6a4137 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 2f96d1252..fd2047ecf 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index ec0760920..50865b0ed 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index e9ec7b525..5698a1ee9 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 349bc4f09..5f6bd3421 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 0b11ecf76..9c6292ec8 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index c43248b89..19b2ad099 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 75c010aa5..4865263f3 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 5de5d59df..07423268d 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 282c3d068..5e6331953 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 71f30d30b..0bb2aa39e 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index 5963c8438..26e869bd8 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index a8c68b9f7..5abbc3c51 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index b9cdbf9d0..d50ad2435 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.10.0", + version = "3.11.2", repo_name = "build_bazel_rules_apple", ) From e3abf13fe41cc463512bb0e61cfbe1d26dfcfd42 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 17:19:17 -0700 Subject: [PATCH 13/58] chore(deps): update dependency vapor/vapor to v4.106.2 (#1320) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.1` -> `4.106.2` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.2`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.2): - fix `HTTPMethod.RAW(value: String)` string representation [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.1...4.106.2) #### What's Changed fix `HTTPMethod.RAW(value: String)` string representation by [@​RandomHashTags](https://redirect.github.com/RandomHashTags) in [#​3249](https://redirect.github.com/vapor/vapor/issues/3249) > Should fix [#​3248](https://redirect.github.com/vapor/vapor/issues/3248) #### New Contributor - [@​RandomHashTags](https://redirect.github.com/RandomHashTags) made their first contribution in [#​3249](https://redirect.github.com/vapor/vapor/issues/3249) πŸŽ‰ ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.1...4.106.2
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index 80dfed9db..b740d9b29 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.1"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.2"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From 89048bd67bd37d3e9b24e02b0bcb10e7f67a3b4c Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:31:57 -0700 Subject: [PATCH 14/58] chore(deps): update dependency rules_swift to v2.2.3 (#1321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_swift | bazel_dep | patch | `2.2.2` -> `2.2.3` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- bzlmod/workspace/MODULE.bazel | 2 +- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/interesting_deps/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/objc_code/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/pkg_manifest_minimal/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- examples/xcmetrics_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel index ba03e5907..684b1d576 100644 --- a/bzlmod/workspace/MODULE.bazel +++ b/bzlmod/workspace/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 30b4b9336..188dc16fa 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index f6d8ca3cb..f45722424 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index f6827e0a8..451495d69 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index f6827e0a8..451495d69 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index d55e2ff56..e3125f2ba 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 27c6a4137..3ec1ebc5f 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index fd2047ecf..aec060e43 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 50865b0ed..18d90c0d0 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index 5698a1ee9..6e87a7ff1 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index 27c74e6fc..b27594f67 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 5f6bd3421..76235522a 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index 9381f021d..20ae7dac9 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 9c6292ec8..b0cf9d9cb 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 19b2ad099..0d7164c29 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 4865263f3..1eec44a00 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 07423268d..895a52616 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 5e6331953..5e9625467 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 0bb2aa39e..8829d82ba 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index 26e869bd8..f81952be8 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep( ) bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 5abbc3c51..ffbbaed2f 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index 99bdfe792..6e9b9c474 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index d50ad2435..34f91f933 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.2", + version = "2.2.3", repo_name = "build_bazel_rules_swift", ) bazel_dep( From 19ef29015b24e584ea6845cfa3761bea931d467c Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:10:46 -0700 Subject: [PATCH 15/58] chore(deps): update dependency stripe/stripe-ios to v24 (#1322) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [stripe/stripe-ios](https://redirect.github.com/stripe/stripe-ios) | major | `from: "23.32.0"` -> `from: "24.0.0"` | --- ### Release Notes
stripe/stripe-ios (stripe/stripe-ios) ### [`v24.0.0`](https://redirect.github.com/stripe/stripe-ios/blob/HEAD/CHANGELOG.md#2400-2024-11-04) [Compare Source](https://redirect.github.com/stripe/stripe-ios/compare/23.32.0...24.0.0) ##### PaymentSheet - \[Changed] The default value of `PaymentSheet.Configuration.paymentMethodLayout` has changed from `.horizontal` to `.automatic`. See [MIGRATING.md](https://redirect.github.com/stripe/stripe-ios/blob/master/MIGRATING.md) for more details. - \[Fixed] Fixed an animation glitch when dismissing PaymentSheet in React Native. - \[Fixed] Fixed an issue with FlowController in vertical layout where the payment method could incorrectly be preserved across a call to `update` when it's no longer valid. - \[Fixed] Fixed a potential deadlock when `paymentOption` is accessed from Swift concurrency. - \[Fixed] Fixed deferred intent validation to handle cloned payment methods ([#​4195](https://redirect.github.com/stripe/stripe-ios/issues/4195) ##### Basic Integration - \[Removed] Basic Integration has been removed. [Please use Mobile Payment Element instead](https://docs.stripe.com/payments/mobile/migrating-to-mobile-payment-element-from-basic-integration).
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/stripe_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/stripe_example/Package.swift b/examples/stripe_example/Package.swift index 91f5309b2..fabecd4c8 100644 --- a/examples/stripe_example/Package.swift +++ b/examples/stripe_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/stripe/stripe-ios", - from: "23.32.0" + from: "24.0.0" ), ] ) From 8d4e7134bc13c0b857d83b04c933c93e79809313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Mar=C3=A7al?= <127062836+lucasmarcal-faire@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:54:43 -0300 Subject: [PATCH 16/58] feat: add string_literal to module identifier allow list (#1319) Add string_literal to module identifier allow list. This case seems to be pretty rare, and besides the fact that it's not mentioned on ModuleMap specs, [Clang actually accepts that](https://github.com/llvm/llvm-project/blob/dafb90dedcda1ad7b94b0bcdbbe7478f7d0f31f6/clang/lib/Lex/ModuleMap.cpp#L1833). It's rare, but you can find examples by searching for `module " path:/(^|\/)*\.modulemap$/` on Github The motivation behind creating this PR is to add support to the swift-llbuild Package build that fails while resolving [this modulemap](https://github.com/swiftlang/swift-llbuild/blob/main/products/libllbuild/include/module.modulemap) This PR alone doesn't fix swift-llbuild build. Some follow-up PRs will be created to add [SPM include folder handling](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/Usage.md#creating-c-language-targets) --------- Co-authored-by: Chuck Grindel --- .../modulemap_parser/collect_module.bzl | 19 ++++++++++++------- .../modulemap_parser/collect_module_tests.bzl | 19 ++++++++++++++++++- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/swiftpkg/internal/modulemap_parser/collect_module.bzl b/swiftpkg/internal/modulemap_parser/collect_module.bzl index 85ceb99c2..b4075956f 100644 --- a/swiftpkg/internal/modulemap_parser/collect_module.bzl +++ b/swiftpkg/internal/modulemap_parser/collect_module.bzl @@ -91,16 +91,21 @@ def _process_module_tokens(parsed_tokens, prefix_tokens, is_submodule): return None, err consumed_count += 1 - module_id_or_asterisk_token, err = tokens.get(parsed_tokens, 1, count = tlen) + module_declaration_identifier_token, err = tokens.get(parsed_tokens, 1, count = tlen) if err != None: return None, err consumed_count += 1 - if not tokens.is_a(module_id_or_asterisk_token, tts.identifier) and \ - not tokens.is_a(module_id_or_asterisk_token, tts.operator, operators.asterisk): + + # Check if the module identifier is an identifier, asterisk, or string literal + # Examples: module Foo, module *, module "Foo" + # The specification does not mention that literal strings are supported. However, + # canonical implementations of module map parsing do support literal strings. + # https://github.com/llvm/llvm-project/blob/dafb90dedcda1ad7b94b0bcdbbe7478f7d0f31f6/clang/lib/Lex/ModuleMap.cpp#L1833 + if not tokens.is_a(module_declaration_identifier_token, tts.identifier) and \ + not tokens.is_a(module_declaration_identifier_token, tts.operator, operators.asterisk) and \ + not tokens.is_a(module_declaration_identifier_token, tts.string_literal): return None, errors.new( - "Expected module identifier or asterisk, but was {}.".format( - module_id_or_asterisk_token.type, - ), + "Expected module identifier, asterisk or string_literal, but was {}.".format(module_declaration_identifier_token.type), ) # Collect the attributes and module members @@ -146,7 +151,7 @@ def _process_module_tokens(parsed_tokens, prefix_tokens, is_submodule): # Create the declaration decl = declarations.module( - module_id = module_id_or_asterisk_token.value, + module_id = module_declaration_identifier_token.value, explicit = explicit, framework = framework, attributes = attributes, diff --git a/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl b/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl index 3aa1fa3ac..3b19aad14 100644 --- a/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl +++ b/swiftpkg/tests/modulemap_parser/collect_module_tests.bzl @@ -105,6 +105,23 @@ def _collect_module_test(ctx): ], ) + do_parse_test( + env, + "module with string literal module id", + text = """ + module "MyModule" {} + """, + expected = [ + declarations.module( + module_id = "MyModule", + framework = False, + explicit = False, + attributes = [], + members = [], + ), + ], + ) + do_parse_test( env, "module with asterisk module", @@ -159,7 +176,7 @@ def _collect_module_test(ctx): text = """ module {} """, - expected_err = "Expected module identifier or asterisk, but was curly_bracket_open.", + expected_err = "Expected module identifier, asterisk or string_literal, but was curly_bracket_open.", ) do_failing_parse_test( From 002ca37f4b9f49b8c134f23266efdd6d7437ce07 Mon Sep 17 00:00:00 2001 From: Zach Gardner Date: Wed, 6 Nov 2024 13:05:15 -0800 Subject: [PATCH 17/58] docs: update spelling error in faq.md (#1327) peak -> top of a mountain, while peek -> look into --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index bce56b3dd..ef9a0b779 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -176,7 +176,7 @@ Here is a quick explainer of why `rules_swift_package_manager` cannot resolve th the new architecture: - Each Swift package is declared as an external Bazel repository. -- During the loading phase, there is no mechanism for one external repository to peak into another +- During the loading phase, there is no mechanism for one external repository to peek into another external repository. In other words, a Swift package cannot query another Swift package to determine all of the available products. - So, when `rules_swift_package_manager` generates a `BUILD.bazel` file for a Swift package external From dbb8243fab3a2f3d9511151bc50584cbf93409c1 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 05:47:47 -0700 Subject: [PATCH 18/58] chore(deps): update dependency vapor/vapor to v4.106.3 (#1328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.2` -> `4.106.3` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.3`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.3): - Adds JPEG XL (JXL) and AVIF HTTPMediaTypes [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.2...4.106.3) #### What's Changed Adds JPEG XL (JXL) and AVIF HTTPMediaTypes by [@​vamsii777](https://redirect.github.com/vamsii777) in [#​3250](https://redirect.github.com/vapor/vapor/issues/3250) > Add additional image types: > > ```swift > app.post("upload") { req in > guard [.jpeg, .png, .tiff, .webp, .jxl, .avif].contains(req.content.contentType) else { > throw Abort(.unsupportedMediaType) > } > // ... > } > ``` #### New Contributor - [@​vamsii777](https://redirect.github.com/vamsii777) made their first contribution in [#​3250](https://redirect.github.com/vapor/vapor/issues/3250) πŸŽ‰ ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.2...4.106.3
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index b740d9b29..b09888a9d 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.2"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.3"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From c7b19d55e698ecfa5ff9d519bb66b76ee02bd864 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:04:00 +0000 Subject: [PATCH 19/58] chore(deps): update dependency quick/nimble to from: "13.6.1" (#1324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [Quick/Nimble](https://redirect.github.com/Quick/Nimble) | patch | `from: "13.6.0"` -> `from: "13.6.1"` | --- ### Release Notes
Quick/Nimble (Quick/Nimble) ### [`v13.6.1`](https://redirect.github.com/Quick/Nimble/releases/tag/v13.6.1) [Compare Source](https://redirect.github.com/Quick/Nimble/compare/v13.6.0...v13.6.1) #### What's Changed - Bump rexml from 3.3.6 to 3.3.9 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/Quick/Nimble/pull/1171](https://redirect.github.com/Quick/Nimble/pull/1171) - Allow beAKindOf and beAnInstanceOf to nest inside of other matchers by [@​younata](https://redirect.github.com/younata) in [https://github.com/Quick/Nimble/pull/1173](https://redirect.github.com/Quick/Nimble/pull/1173) **Full Changelog**: https://github.com/Quick/Nimble/compare/v13.6.0...v13.6.1
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/nimble_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/nimble_example/Package.swift b/examples/nimble_example/Package.swift index 6ac2e7ff3..56e47730c 100644 --- a/examples/nimble_example/Package.swift +++ b/examples/nimble_example/Package.swift @@ -11,7 +11,7 @@ let package = Package( ), .package( url: "https://github.com/Quick/Nimble", - from: "13.6.0" + from: "13.6.1" ), ], targets: [ From abaf8721a61fb41dab784ac21db33e0b87b567a3 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:19:40 +0000 Subject: [PATCH 20/58] chore(deps): update dependency sdwebimage/sdwebimageswiftui to from: "3.1.3" (#1325) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [SDWebImage/SDWebImageSwiftUI](https://redirect.github.com/SDWebImage/SDWebImageSwiftUI) | patch | `from: "3.1.2"` -> `from: "3.1.3"` | --- ### Release Notes
SDWebImage/SDWebImageSwiftUI (SDWebImage/SDWebImageSwiftUI) ### [`v3.1.3`](https://redirect.github.com/SDWebImage/SDWebImageSwiftUI/blob/HEAD/CHANGELOG.md#313---2024-11-06) [Compare Source](https://redirect.github.com/SDWebImage/SDWebImageSwiftUI/compare/3.1.2...3.1.3) - Fixed old version compiler does not support automatic self capture in Xcode 14.2 and Swift 5.7.2 [#​340](https://redirect.github.com/SDWebImage/SDWebImageSwiftUI/issues/340) - Fix the data race because progress block is called in non-main queue [#​341](https://redirect.github.com/SDWebImage/SDWebImageSwiftUI/issues/341)
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/resources_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/resources_example/swift/Package.swift b/examples/resources_example/swift/Package.swift index bb3e0af8d..fedb9d509 100644 --- a/examples/resources_example/swift/Package.swift +++ b/examples/resources_example/swift/Package.swift @@ -9,7 +9,7 @@ let package = Package( .package(path: "../third_party/app_lovin_sdk"), .package(path: "../third_party/package_with_resources"), .package(url: "https://github.com/Iterable/swift-sdk", from: "6.5.7"), - .package(url: "https://github.com/SDWebImage/SDWebImageSwiftUI.git", from: "3.1.2"), + .package(url: "https://github.com/SDWebImage/SDWebImageSwiftUI.git", from: "3.1.3"), .package(url: "https://github.com/google/GoogleSignIn-iOS", from: "8.0.0"), .package( url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk", From 08dd4d65a58f36cd0561981ca91d40c1a3c81185 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:36:08 +0000 Subject: [PATCH 21/58] chore(deps): update dependency rules_proto to v7 (#1326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_proto | bazel_dep | major | `6.0.2` -> `7.0.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 451495d69..259c334ba 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "6.0.2") +bazel_dep(name = "rules_proto", version = "7.0.0") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 451495d69..259c334ba 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "6.0.2") +bazel_dep(name = "rules_proto", version = "7.0.0") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. From 8697941071ef2878e65e68fdd68fd4a14b795491 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 07:28:14 -0700 Subject: [PATCH 22/58] chore(deps): update dependency quick/nimble to from: "13.6.2" (#1329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [Quick/Nimble](https://redirect.github.com/Quick/Nimble) | patch | `from: "13.6.1"` -> `from: "13.6.2"` | --- ### Release Notes
Quick/Nimble (Quick/Nimble) ### [`v13.6.2`](https://redirect.github.com/Quick/Nimble/releases/tag/v13.6.2) [Compare Source](https://redirect.github.com/Quick/Nimble/compare/v13.6.1...v13.6.2) #### What's Changed - Fix regression in beAnInstanceOf by [@​younata](https://redirect.github.com/younata) in [https://github.com/Quick/Nimble/pull/1174](https://redirect.github.com/Quick/Nimble/pull/1174) **Full Changelog**: https://github.com/Quick/Nimble/compare/v13.6.1...v13.6.2
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/nimble_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/nimble_example/Package.swift b/examples/nimble_example/Package.swift index 56e47730c..8eab7a31b 100644 --- a/examples/nimble_example/Package.swift +++ b/examples/nimble_example/Package.swift @@ -11,7 +11,7 @@ let package = Package( ), .package( url: "https://github.com/Quick/Nimble", - from: "13.6.1" + from: "13.6.2" ), ], targets: [ From 5f31f1cacdeff9924f43f4970400c0465643a2e3 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:26:53 -0700 Subject: [PATCH 23/58] chore(deps): update dependency rules_apple to v3.12.0 (#1332) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_apple | bazel_dep | minor | `3.11.2` -> `3.12.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 188dc16fa..e6c48122c 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index f45722424..f7de7dd2f 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 259c334ba..4e81e0430 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 259c334ba..4e81e0430 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 3ec1ebc5f..74117985b 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index aec060e43..31be3bacf 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 18d90c0d0..02f9b47e4 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index 6e87a7ff1..1b7a62d52 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 76235522a..453068f3b 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index b0cf9d9cb..8c7783aba 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 0d7164c29..217b28fa2 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 1eec44a00..afee11c86 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 895a52616..c97fefb5b 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 5e9625467..80c0dac66 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 8829d82ba..95e455fc1 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index f81952be8..fd06c297d 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index ffbbaed2f..986dbed4f 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 34f91f933..58439a01a 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.11.2", + version = "3.12.0", repo_name = "build_bazel_rules_apple", ) From 8763d33d8457b0547268bf59eb887f5859465162 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:11:25 -0700 Subject: [PATCH 24/58] chore(deps): update dependency pointfreeco/swift-composable-architecture to from: "1.16.0" (#1333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pointfreeco/swift-composable-architecture](https://redirect.github.com/pointfreeco/swift-composable-architecture) | minor | `from: "1.15.2"` -> `from: "1.16.0"` | --- ### Release Notes
pointfreeco/swift-composable-architecture (pointfreeco/swift-composable-architecture) ### [`v1.16.0`](https://redirect.github.com/pointfreeco/swift-composable-architecture/releases/tag/1.16.0) [Compare Source](https://redirect.github.com/pointfreeco/swift-composable-architecture/compare/1.15.2...1.16.0) #### What's Changed - Added: support for `Date` values in shared app storage (thanks [@​rudedogdhc](https://redirect.github.com/rudedogdhc), [https://github.com/pointfreeco/swift-composable-architecture/pull/3470](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3470)). - Performance: Improved performance of shared app storage observation ([https://github.com/pointfreeco/swift-composable-architecture/pull/3487](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3487)). - Performance: Reduce amount of locking in the Combine subject powering the Store (thanks [@​iampatbrown](https://redirect.github.com/iampatbrown), [https://github.com/pointfreeco/swift-composable-architecture/pull/3476](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3476)). - Fixed: Addressed a potential crash in shared app storage when many app storage variables are notified by notification center during a SwiftUI view body update ([https://github.com/pointfreeco/swift-composable-architecture/pull/3487](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3487)). - Fixed: Addressed a race condition in the Combine subject powering the Store (thanks [@​kabiroberai](https://redirect.github.com/kabiroberai), [https://github.com/pointfreeco/swift-composable-architecture/pull/3475](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3475)). - Fixed: Better autocomplete for dynamic member lookup ([https://github.com/pointfreeco/swift-composable-architecture/pull/3463](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3463)). - Infrastructure: Capture existing `@Shared` test store behavior in test with a to-do for better behavior in the future (thanks [@​rcarver](https://redirect.github.com/rcarver), [https://github.com/pointfreeco/swift-composable-architecture/pull/3455](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3455)). #### New Contributors - [@​rudedogdhc](https://redirect.github.com/rudedogdhc) made their first contribution in [https://github.com/pointfreeco/swift-composable-architecture/pull/3470](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3470) **Full Changelog**: https://github.com/pointfreeco/swift-composable-architecture/compare/1.15.2...1.16.0
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/tca_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tca_example/Package.swift b/examples/tca_example/Package.swift index 241708ac1..c23750c44 100644 --- a/examples/tca_example/Package.swift +++ b/examples/tca_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/pointfreeco/swift-composable-architecture", - .upToNextMajor(from: "1.15.2") + .upToNextMajor(from: "1.16.0") ), ] ) From 7bd875f6617afba1d6331e7de328427e27acf966 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 08:32:58 -0700 Subject: [PATCH 25/58] chore(deps): update dependency bazel to v7.4.1 (#1334) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [bazel](https://redirect.github.com/bazelbuild/bazel) | patch | `7.4.0` -> `7.4.1` | --- ### Release Notes
bazelbuild/bazel (bazel) ### [`v7.4.1`](https://redirect.github.com/bazelbuild/bazel/blob/HEAD/CHANGELOG.md#Release-741-2024-11-11) [Compare Source](https://redirect.github.com/bazelbuild/bazel/compare/7.4.0...7.4.1) ``` Release Notes: ```
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index ba7f754d0..815da58b7 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.4.0 +7.4.1 From 341dd4818c9b8f8d60627efad028d714deb36626 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 20:12:58 +0000 Subject: [PATCH 26/58] chore(deps): update dependency gazelle to v0.40.0 (#1336) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | gazelle | bazel_dep | minor | `0.39.1` -> `0.40.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). --------- Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel --- MODULE.bazel | 7 +- bzlmod/workspace/MODULE.bazel | 2 +- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/interesting_deps/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/objc_code/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/pkg_manifest_minimal/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- examples/xcmetrics_example/MODULE.bazel | 2 +- go.mod | 12 +- go.sum | 96 ++------- go_deps.bzl | 204 ++---------------- .../template_files/MODULE.bazel | 2 +- 27 files changed, 67 insertions(+), 298 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8a0387aba..edd242804 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ bazel_dep(name = "bazel_skylib", version = "1.4.2") bazel_dep(name = "rules_license", version = "0.0.8") bazel_dep( name = "rules_go", - version = "0.47.0", + version = "0.50.1", repo_name = "io_bazel_rules_go", ) @@ -34,7 +34,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.38.0", + version = "0.40.0", repo_name = "bazel_gazelle", ) @@ -44,6 +44,9 @@ apple_cc_configure = use_extension( ) use_repo(apple_cc_configure, "local_config_apple_cc") +go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") +go_sdk.download(version = "1.23.1") + go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") go_deps.from_file(go_mod = "//:go.mod") use_repo( diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel index 684b1d576..d872fd1c0 100644 --- a/bzlmod/workspace/MODULE.bazel +++ b/bzlmod/workspace/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index e6c48122c..6f941f214 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -36,7 +36,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index f7de7dd2f..0f7e61fe2 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 4e81e0430..07a0f6b1f 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -44,7 +44,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 4e81e0430..07a0f6b1f 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -44,7 +44,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index e3125f2ba..514a4a974 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 74117985b..9948238da 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 31be3bacf..26df46d5f 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 02f9b47e4..5fa455c0c 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index 1b7a62d52..bcf10a36b 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index b27594f67..e09013b4f 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 453068f3b..4ca66af72 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index 20ae7dac9..d7468f417 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 8c7783aba..2f8121a3f 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 217b28fa2..42a1659bb 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index afee11c86..6c789415a 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index c97fefb5b..3ce720814 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index 80c0dac66..af4d9795f 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 95e455fc1..233a37af3 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index fd06c297d..902a4deb1 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 986dbed4f..6fe9fddcf 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index 6e9b9c474..a3fe88f95 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) diff --git a/go.mod b/go.mod index b76e1fef1..dbd47964b 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,15 @@ module github.com/cgrindel/rules_swift_package_manager -go 1.21.4 +go 1.22.0 + +toolchain go1.22.9 // Workaround for inconsistent Go versions being used in rules_bazel_integration_test tests. // toolchain go1.21.5 require ( - github.com/bazelbuild/bazel-gazelle v0.38.0 - github.com/bazelbuild/buildtools v0.0.0-20240626162158-92a716d768c0 + github.com/bazelbuild/bazel-gazelle v0.40.0 + github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44 github.com/creasty/defaults v1.8.0 github.com/deckarep/golang-set/v2 v2.6.0 github.com/spf13/cobra v1.8.1 @@ -22,7 +24,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/sys v0.26.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect ) diff --git a/go.sum b/go.sum index c6f31508b..0fbd4014b 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,11 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/bazelbuild/bazel-gazelle v0.38.0 h1:7SABASdzy94tbvklgX8ThG+1y7ZNl2eFYRVevjOXpgw= -github.com/bazelbuild/bazel-gazelle v0.38.0/go.mod h1:hspieDFb3FIjjhQV/dZjqq8qiVxsQ4rtRiWNZMihEXg= -github.com/bazelbuild/buildtools v0.0.0-20240626162158-92a716d768c0 h1:tVa7swb7n+9X2nS9XsCqOQ7ZGm0t+t11vWYTKoFiWB8= -github.com/bazelbuild/buildtools v0.0.0-20240626162158-92a716d768c0/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo= -github.com/bazelbuild/rules_go v0.46.0 h1:CTefzjN/D3Cdn3rkrM6qMWuQj59OBcuOjyIp3m4hZ7s= -github.com/bazelbuild/rules_go v0.46.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= -github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= -github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/bazelbuild/bazel-gazelle v0.40.0 h1:SAYys3KRG5i3KTgQAvO423bLT1rQMSgqEKReMkM/CW0= +github.com/bazelbuild/bazel-gazelle v0.40.0/go.mod h1:xI42W5YdKQg0g3rj1jZfdW8j1UihNmvb5KwWDdHg2ec= +github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44 h1:FGzENZi+SX9I7h9xvMtRA3rel8hCEfyzSixteBgn7MU= +github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= +github.com/bazelbuild/rules_go v0.50.1 h1:/BUvuaB8MEiUA2oLPPCGtuw5V+doAYyiGTFyoSWlkrw= +github.com/bazelbuild/rules_go v0.50.1/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= +github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= +github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creasty/defaults v1.8.0 h1:z27FJxCAa0JKt3utc0sCImAEb+spPucmKoOdLHvHYKk= github.com/creasty/defaults v1.8.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM= @@ -20,32 +13,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= @@ -53,60 +26,19 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4= golang.org/x/tools/go/vcs v0.1.0-deprecated/go.mod h1:zUrvATBAvEI9535oC0yWYsLsHIV4Z7g63sNPVMtuBy8= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/go_deps.bzl b/go_deps.bzl index 8ab4d0056..7caae0c76 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -5,21 +5,13 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") def swift_bazel_go_dependencies(): """Declare the Go dependencies for `rules_swift_package_manager`.""" - maybe( - go_repository, - name = "co_honnef_go_tools", - build_external = "external", - importpath = "honnef.co/go/tools", - sum = "h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=", - version = "v0.0.0-20190523083050-ea95bdfd59fc", - ) maybe( go_repository, name = "com_github_bazelbuild_bazel_gazelle", build_external = "external", importpath = "github.com/bazelbuild/bazel-gazelle", - sum = "h1:7SABASdzy94tbvklgX8ThG+1y7ZNl2eFYRVevjOXpgw=", - version = "v0.38.0", + sum = "h1:SAYys3KRG5i3KTgQAvO423bLT1rQMSgqEKReMkM/CW0=", + version = "v0.40.0", ) maybe( go_repository, @@ -27,72 +19,24 @@ def swift_bazel_go_dependencies(): build_external = "external", build_naming_convention = "go_default_library", importpath = "github.com/bazelbuild/buildtools", - sum = "h1:tVa7swb7n+9X2nS9XsCqOQ7ZGm0t+t11vWYTKoFiWB8=", - version = "v0.0.0-20240626162158-92a716d768c0", + sum = "h1:FGzENZi+SX9I7h9xvMtRA3rel8hCEfyzSixteBgn7MU=", + version = "v0.0.0-20240918101019-be1c24cc9a44", ) maybe( go_repository, name = "com_github_bazelbuild_rules_go", build_external = "external", importpath = "github.com/bazelbuild/rules_go", - sum = "h1:CTefzjN/D3Cdn3rkrM6qMWuQj59OBcuOjyIp3m4hZ7s=", - version = "v0.46.0", + sum = "h1:/BUvuaB8MEiUA2oLPPCGtuw5V+doAYyiGTFyoSWlkrw=", + version = "v0.50.1", ) maybe( go_repository, name = "com_github_bmatcuk_doublestar_v4", build_external = "external", importpath = "github.com/bmatcuk/doublestar/v4", - sum = "h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=", - version = "v4.6.1", - ) - maybe( - go_repository, - name = "com_github_burntsushi_toml", - build_external = "external", - importpath = "github.com/BurntSushi/toml", - sum = "h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=", - version = "v0.3.1", - ) - maybe( - go_repository, - name = "com_github_census_instrumentation_opencensus_proto", - build_external = "external", - importpath = "github.com/census-instrumentation/opencensus-proto", - sum = "h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=", - version = "v0.2.1", - ) - maybe( - go_repository, - name = "com_github_chzyer_logex", - build_external = "external", - importpath = "github.com/chzyer/logex", - sum = "h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=", - version = "v1.1.10", - ) - maybe( - go_repository, - name = "com_github_chzyer_readline", - build_external = "external", - importpath = "github.com/chzyer/readline", - sum = "h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=", - version = "v0.0.0-20180603132655-2972be24d48e", - ) - maybe( - go_repository, - name = "com_github_chzyer_test", - build_external = "external", - importpath = "github.com/chzyer/test", - sum = "h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=", - version = "v0.0.0-20180213035817-a1ea475d72b1", - ) - maybe( - go_repository, - name = "com_github_client9_misspell", - build_external = "external", - importpath = "github.com/client9/misspell", - sum = "h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=", - version = "v0.3.4", + sum = "h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=", + version = "v4.7.1", ) maybe( go_repository, @@ -126,53 +70,21 @@ def swift_bazel_go_dependencies(): sum = "h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=", version = "v2.6.0", ) - maybe( - go_repository, - name = "com_github_envoyproxy_go_control_plane", - build_external = "external", - importpath = "github.com/envoyproxy/go-control-plane", - sum = "h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w=", - version = "v0.9.1-0.20191026205805-5f8ba28d4473", - ) - maybe( - go_repository, - name = "com_github_envoyproxy_protoc_gen_validate", - build_external = "external", - importpath = "github.com/envoyproxy/protoc-gen-validate", - sum = "h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=", - version = "v0.1.0", - ) maybe( go_repository, name = "com_github_fsnotify_fsnotify", build_external = "external", importpath = "github.com/fsnotify/fsnotify", - sum = "h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=", - version = "v1.7.0", - ) - maybe( - go_repository, - name = "com_github_golang_glog", - build_external = "external", - importpath = "github.com/golang/glog", - sum = "h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=", - version = "v0.0.0-20160126235308-23def4e6c14b", - ) - maybe( - go_repository, - name = "com_github_golang_mock", - build_external = "external", - importpath = "github.com/golang/mock", - sum = "h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=", - version = "v1.1.1", + sum = "h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=", + version = "v1.8.0", ) maybe( go_repository, name = "com_github_golang_protobuf", build_external = "external", importpath = "github.com/golang/protobuf", - sum = "h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=", - version = "v1.4.3", + sum = "h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=", + version = "v1.5.0", ) maybe( go_repository, @@ -198,14 +110,6 @@ def swift_bazel_go_dependencies(): sum = "h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=", version = "v1.0.0", ) - maybe( - go_repository, - name = "com_github_prometheus_client_model", - build_external = "external", - importpath = "github.com/prometheus/client_model", - sum = "h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=", - version = "v0.0.0-20190812154241-14fe0d1b01d4", - ) maybe( go_repository, name = "com_github_russross_blackfriday_v2", @@ -246,14 +150,6 @@ def swift_bazel_go_dependencies(): sum = "h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=", version = "v1.9.0", ) - maybe( - go_repository, - name = "com_google_cloud_go", - build_external = "external", - importpath = "cloud.google.com/go", - sum = "h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=", - version = "v0.26.0", - ) maybe( go_repository, name = "in_gopkg_check_v1", @@ -278,45 +174,13 @@ def swift_bazel_go_dependencies(): sum = "h1:xwwDQW5We85NaTk2APgoN9202w/l0DVGp+GZMfsrh7s=", version = "v0.0.0-20210223155950-e043a3d3c984", ) - maybe( - go_repository, - name = "org_golang_google_appengine", - build_external = "external", - importpath = "google.golang.org/appengine", - sum = "h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=", - version = "v1.4.0", - ) - maybe( - go_repository, - name = "org_golang_google_genproto", - build_external = "external", - importpath = "google.golang.org/genproto", - sum = "h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=", - version = "v0.0.0-20200526211855-cb27e3aa2013", - ) - maybe( - go_repository, - name = "org_golang_google_grpc", - build_external = "external", - importpath = "google.golang.org/grpc", - sum = "h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=", - version = "v1.27.0", - ) maybe( go_repository, name = "org_golang_google_protobuf", build_external = "external", importpath = "google.golang.org/protobuf", - sum = "h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=", - version = "v1.25.0", - ) - maybe( - go_repository, - name = "org_golang_x_crypto", - build_external = "external", - importpath = "golang.org/x/crypto", - sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=", - version = "v0.0.0-20190308221718-c2843e01d9a2", + sum = "h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=", + version = "v1.33.0", ) maybe( go_repository, @@ -326,37 +190,13 @@ def swift_bazel_go_dependencies(): sum = "h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=", version = "v0.0.0-20240808152545-0cdaa3abc0fa", ) - maybe( - go_repository, - name = "org_golang_x_lint", - build_external = "external", - importpath = "golang.org/x/lint", - sum = "h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=", - version = "v0.0.0-20190313153728-d0100b6bd8b3", - ) maybe( go_repository, name = "org_golang_x_mod", build_external = "external", importpath = "golang.org/x/mod", - sum = "h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=", - version = "v0.20.0", - ) - maybe( - go_repository, - name = "org_golang_x_net", - build_external = "external", - importpath = "golang.org/x/net", - sum = "h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=", - version = "v0.0.0-20190311183353-d8887717615a", - ) - maybe( - go_repository, - name = "org_golang_x_oauth2", - build_external = "external", - importpath = "golang.org/x/oauth2", - sum = "h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=", - version = "v0.0.0-20180821212333-d2e6202438be", + sum = "h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=", + version = "v0.21.0", ) maybe( go_repository, @@ -371,8 +211,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_sys", build_external = "external", importpath = "golang.org/x/sys", - sum = "h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=", - version = "v0.21.0", + sum = "h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=", + version = "v0.26.0", ) maybe( go_repository, @@ -398,11 +238,3 @@ def swift_bazel_go_dependencies(): sum = "h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4=", version = "v0.1.0-deprecated", ) - maybe( - go_repository, - name = "org_golang_x_xerrors", - build_external = "external", - importpath = "golang.org/x/xerrors", - sum = "h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=", - version = "v0.0.0-20200804184101-5ec99f83aff1", - ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 58439a01a..78b6c63ba 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -28,7 +28,7 @@ bazel_dep( ) bazel_dep( name = "gazelle", - version = "0.39.1", + version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle", ) From 3a7d59c05b2350532a5cb9fdef47db30e1920fb7 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:25:42 +0000 Subject: [PATCH 27/58] fix(deps): update golang.org/x/exp digest to 701f63a (#1206) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/exp | require | digest | `0cdaa3a` -> `701f63a` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). --------- Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel --- go.mod | 4 ++-- go.sum | 4 ++-- go_deps.bzl | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index dbd47964b..c14626195 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/cgrindel/rules_swift_package_manager go 1.22.0 -toolchain go1.22.9 +toolchain go1.23.1 // Workaround for inconsistent Go versions being used in rules_bazel_integration_test tests. // toolchain go1.21.5 @@ -14,7 +14,7 @@ require ( github.com/deckarep/golang-set/v2 v2.6.0 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/text v0.19.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 0fbd4014b..c37fe1141 100644 --- a/go.sum +++ b/go.sum @@ -26,8 +26,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= diff --git a/go_deps.bzl b/go_deps.bzl index 7caae0c76..61af6681a 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -187,8 +187,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_exp", build_external = "external", importpath = "golang.org/x/exp", - sum = "h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=", - version = "v0.0.0-20240808152545-0cdaa3abc0fa", + sum = "h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=", + version = "v0.0.0-20240909161429-701f63a606c0", ) maybe( go_repository, @@ -227,8 +227,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_tools", build_external = "external", importpath = "golang.org/x/tools", - sum = "h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=", - version = "v0.24.0", + sum = "h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=", + version = "v0.25.0", ) maybe( go_repository, From fadc8b23c06d490fa197c8c61c5c8e9706a471e8 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 03:57:30 -0700 Subject: [PATCH 28/58] chore(deps): update dependency rules_proto to v7.0.1 (#1330) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_proto | bazel_dep | patch | `7.0.0` -> `7.0.1` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 07a0f6b1f..1a53cf2de 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "7.0.0") +bazel_dep(name = "rules_proto", version = "7.0.1") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 07a0f6b1f..1a53cf2de 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "7.0.0") +bazel_dep(name = "rules_proto", version = "7.0.1") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. From c562718102c5e2eef43861f69c645f5337376c37 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 12:43:20 +0000 Subject: [PATCH 29/58] chore(deps): update dependency rules_apple to v3.13.0 (#1337) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_apple | bazel_dep | minor | `3.12.0` -> `3.13.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 6f941f214..4c14b3671 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index 0f7e61fe2..8fe6b1158 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 1a53cf2de..7dd56e71d 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 1a53cf2de..7dd56e71d 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -33,7 +33,7 @@ use_repo( bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 9948238da..a7a7e2cde 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index 26df46d5f..f8e63dc09 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index 5fa455c0c..cd9670a00 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index bcf10a36b..ef2727b81 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index 4ca66af72..a7f11c6bd 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index 2f8121a3f..cb660fb23 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index 42a1659bb..cb0131e2c 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 6c789415a..06a59108d 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index 3ce720814..bdb961718 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index af4d9795f..ff8cab54f 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 233a37af3..12b812c45 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index 902a4deb1..13ed10a36 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 6fe9fddcf..4cd714caf 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 78b6c63ba..228b9bef7 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "3.12.0", + version = "3.13.0", repo_name = "build_bazel_rules_apple", ) From 2d78a6c11b0e9a1d107497c851c2747fa0eb6692 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:33:31 +0000 Subject: [PATCH 30/58] chore(deps): update dependency rules_xcodeproj to v2.9.1 (#1338) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_xcodeproj | bazel_dep | minor | `2.8.1` -> `2.9.1` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). --------- Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 4c14b3671..62339bd1b 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( bazel_dep( name = "rules_xcodeproj", - version = "2.8.1", + version = "2.9.1", dev_dependency = True, ) bazel_dep( diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index a7a7e2cde..63d71a2b8 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -37,7 +37,7 @@ bazel_dep( ) bazel_dep( name = "rules_xcodeproj", - version = "2.8.1", + version = "2.9.1", dev_dependency = True, ) From 2ecb32a1034738caa430ea2ee0ca458797b62b5b Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:54:28 +0000 Subject: [PATCH 31/58] fix(deps): update module golang.org/x/text to v0.20.0 (#1331) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/text | require | minor | `v0.19.0` -> `v0.20.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: Chuck Grindel Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 8 ++++---- go_deps.bzl | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index c14626195..2c58c8281 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 - golang.org/x/text v0.19.0 + golang.org/x/text v0.20.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index c37fe1141..997499deb 100644 --- a/go.sum +++ b/go.sum @@ -30,12 +30,12 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/tools/go/vcs v0.1.0-deprecated h1:cOIJqWBl99H1dH5LWizPa+0ImeeJq3t3cJjaeOWUAL4= golang.org/x/tools/go/vcs v0.1.0-deprecated/go.mod h1:zUrvATBAvEI9535oC0yWYsLsHIV4Z7g63sNPVMtuBy8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/go_deps.bzl b/go_deps.bzl index 61af6681a..76f1c58ee 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -203,8 +203,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_sync", build_external = "external", importpath = "golang.org/x/sync", - sum = "h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=", - version = "v0.8.0", + sum = "h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=", + version = "v0.9.0", ) maybe( go_repository, @@ -219,8 +219,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_text", build_external = "external", importpath = "golang.org/x/text", - sum = "h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=", - version = "v0.19.0", + sum = "h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=", + version = "v0.20.0", ) maybe( go_repository, From a9869a7832eb3fb6af5c1c528fd03ee9a5608590 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 14:07:10 +0000 Subject: [PATCH 32/58] chore(deps): update dependency firebase/firebase-ios-sdk to from: "11.5.0" (#1335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [firebase/firebase-ios-sdk](https://redirect.github.com/firebase/firebase-ios-sdk) | minor | `from: "11.4.0"` -> `from: "11.5.0"` | --- ### Release Notes
firebase/firebase-ios-sdk (firebase/firebase-ios-sdk) ### [`v11.5.0`](https://redirect.github.com/firebase/firebase-ios-sdk/compare/11.4.0...11.5.0) [Compare Source](https://redirect.github.com/firebase/firebase-ios-sdk/compare/11.4.0...11.5.0)
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/firebase_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/firebase_example/Package.swift b/examples/firebase_example/Package.swift index 526ffa8f5..e7e39875c 100644 --- a/examples/firebase_example/Package.swift +++ b/examples/firebase_example/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "firebase_example", dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: "11.4.0")), + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: "11.5.0")), // Used by crashlytics example .package(url: "https://github.com/ashleymills/Reachability.swift.git", .upToNextMajor(from: "5.2.4")), ] From 4ce2f9b282a2b4c227b579de30c5f06a84037502 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 16:54:07 +0000 Subject: [PATCH 33/58] chore(deps): update dependency pointfreeco/swift-composable-architecture to from: "1.16.1" (#1339) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pointfreeco/swift-composable-architecture](https://redirect.github.com/pointfreeco/swift-composable-architecture) | patch | `from: "1.16.0"` -> `from: "1.16.1"` | --- ### Release Notes
pointfreeco/swift-composable-architecture (pointfreeco/swift-composable-architecture) ### [`v1.16.1`](https://redirect.github.com/pointfreeco/swift-composable-architecture/releases/tag/1.16.1) [Compare Source](https://redirect.github.com/pointfreeco/swift-composable-architecture/compare/1.16.0...1.16.1) #### What's Changed - Fixed: Address a potential race condition in shared file storage ([https://github.com/pointfreeco/swift-composable-architecture/pull/3479](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3479)). - Fixed: Add `@ViewBuilder` to `NavigationStack` root view(thanks [@​joshrl](https://redirect.github.com/joshrl), [https://github.com/pointfreeco/swift-composable-architecture/pull/3493](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3493)). - Fixed: Address potential crash in KVO shared app storage observation during cancellation (thanks [@​pyrtsa](https://redirect.github.com/pyrtsa), [https://github.com/pointfreeco/swift-composable-architecture/pull/3494](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3494)). #### New Contributors - [@​joshrl](https://redirect.github.com/joshrl) made their first contribution in [https://github.com/pointfreeco/swift-composable-architecture/pull/3493](https://redirect.github.com/pointfreeco/swift-composable-architecture/pull/3493) **Full Changelog**: https://github.com/pointfreeco/swift-composable-architecture/compare/1.16.0...1.16.1
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/tca_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/tca_example/Package.swift b/examples/tca_example/Package.swift index c23750c44..1885d898e 100644 --- a/examples/tca_example/Package.swift +++ b/examples/tca_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/pointfreeco/swift-composable-architecture", - .upToNextMajor(from: "1.16.0") + .upToNextMajor(from: "1.16.1") ), ] ) From 6a0792f999be423d71a447c13d5d6d53f8ec77ab Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:22:38 +0000 Subject: [PATCH 34/58] chore(deps): update dependency rules_proto to v7.0.2 (#1343) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_proto | bazel_dep | patch | `7.0.1` -> `7.0.2` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 7dd56e71d..121658060 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "7.0.1") +bazel_dep(name = "rules_proto", version = "7.0.2") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 7dd56e71d..121658060 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -49,7 +49,7 @@ bazel_dep( repo_name = "bazel_gazelle", ) -bazel_dep(name = "rules_proto", version = "7.0.1") +bazel_dep(name = "rules_proto", version = "7.0.2") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. From 43292a8354641e9fff968d60435b37fc4a2de1da Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:35:26 +0000 Subject: [PATCH 35/58] chore(deps): update dependency go to v1.23.3 (#1341) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [go](https://go.dev/) ([source](https://redirect.github.com/golang/go)) | toolchain | minor | `1.22.9` -> `1.23.3` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2c58c8281..fc39c2fff 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/cgrindel/rules_swift_package_manager go 1.22.0 -toolchain go1.23.1 +toolchain go1.23.3 // Workaround for inconsistent Go versions being used in rules_bazel_integration_test tests. // toolchain go1.21.5 From 85bd5864a3e351fab895eb540a887ffdeea8b326 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:24:58 +0000 Subject: [PATCH 36/58] fix(deps): update golang.org/x/exp digest to 2d47ceb (#1342) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | golang.org/x/exp | require | digest | `701f63a` -> `2d47ceb` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- go_deps.bzl | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index fc39c2fff..877cda77f 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/deckarep/golang-set/v2 v2.6.0 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 + golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f golang.org/x/text v0.20.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -24,7 +24,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/mod v0.21.0 // indirect + golang.org/x/mod v0.22.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect ) diff --git a/go.sum b/go.sum index 997499deb..78c01ea5a 100644 --- a/go.sum +++ b/go.sum @@ -26,10 +26,10 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= 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= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= +golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= diff --git a/go_deps.bzl b/go_deps.bzl index 76f1c58ee..27b9ebb99 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -187,16 +187,16 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_exp", build_external = "external", importpath = "golang.org/x/exp", - sum = "h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=", - version = "v0.0.0-20240909161429-701f63a606c0", + sum = "h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=", + version = "v0.0.0-20241108190413-2d47ceb2692f", ) maybe( go_repository, name = "org_golang_x_mod", build_external = "external", importpath = "golang.org/x/mod", - sum = "h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=", - version = "v0.21.0", + sum = "h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=", + version = "v0.22.0", ) maybe( go_repository, @@ -227,8 +227,8 @@ def swift_bazel_go_dependencies(): name = "org_golang_x_tools", build_external = "external", importpath = "golang.org/x/tools", - sum = "h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=", - version = "v0.25.0", + sum = "h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=", + version = "v0.27.0", ) maybe( go_repository, From 65dd1eb30d0d07eb45a633e7f5fd7727141f8906 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:45:24 +0000 Subject: [PATCH 37/58] chore(deps): update dependency nicklockwood/swiftformat to from: "0.55.0" (#1344) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [nicklockwood/SwiftFormat](https://redirect.github.com/nicklockwood/SwiftFormat) | minor | `from: "0.54.6"` -> `from: "0.55.0"` | --- ### Release Notes
nicklockwood/SwiftFormat (nicklockwood/SwiftFormat) ### [`v0.55.0`](https://redirect.github.com/nicklockwood/SwiftFormat/blob/HEAD/CHANGELOG.md#0550-2024-11-16) [Compare Source](https://redirect.github.com/nicklockwood/SwiftFormat/compare/0.54.6...0.55.0) - Added `docCommentsBeforeModifiers` rule to hoist doc comments above declaration modifiers - Added `unusedPrivateDeclarations` rule to remove unused `private` or `fileprivate` declarations - Added `propertyTypes` rule to control the use of inferred or explicit types for properties - Renamed the `--redundanttype` option to `--propertytypes` as it's shared by both rules - Added `--ranges preserve` and `--operatorfunc preserve` options - Added `--languagemode` option to specify if you are using Swift 5 or 6 language mode - The `organizeDeclarations` rule can now sort declarations by name/type/visibility/etc - Fixed `organizeDeclarations` bug where `--beforemarks` unexpectedly matched keywords in function bodies - Fixed missing lint output for `organizeDeclarations` rule - Fixed bug in `markTypes` rule for chained protocol extension names - Renamed the confusing `--onelineforeach` option to `--inlinedforeach` - Git info can now be used in header comments when formatting code from stdin - You can now use the `--outputtokens` option to print output as tokens in JSON format - Each rule and test is now defined in a separate file to make it easier to maintain/contribute - Updated minimum Swift version for building SwiftFormat to 5.3 (you can still format older Swift code) - Docker build now uses static Linux SDK
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/pkg_manifest_minimal/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pkg_manifest_minimal/Package.swift b/examples/pkg_manifest_minimal/Package.swift index 57b6b6104..9cac134c3 100644 --- a/examples/pkg_manifest_minimal/Package.swift +++ b/examples/pkg_manifest_minimal/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.54.6"), + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.0"), .package(path: "third_party/my_local_package"), .package(path: "third_party/NotThatAmazingModule"), ] From 47874c143646972456da73ee4ef75e1298ef8b1c Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:58:27 +0000 Subject: [PATCH 38/58] chore(deps): update dependency googlemaps/ios-maps-sdk to from: "9.2.0" (#1346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [googlemaps/ios-maps-sdk](https://redirect.github.com/googlemaps/ios-maps-sdk) | minor | `from: "9.1.1"` -> `from: "9.2.0"` | --- ### Release Notes
googlemaps/ios-maps-sdk (googlemaps/ios-maps-sdk) ### [`v9.2.0`](https://redirect.github.com/googlemaps/ios-maps-sdk/compare/9.1.1...9.2.0) [Compare Source](https://redirect.github.com/googlemaps/ios-maps-sdk/compare/9.1.1...9.2.0)
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/google_maps_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/google_maps_example/Package.swift b/examples/google_maps_example/Package.swift index 0a7ead069..b1e675ffd 100644 --- a/examples/google_maps_example/Package.swift +++ b/examples/google_maps_example/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "google_maps_example", dependencies: [ - .package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.1.1"), + .package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.2.0"), ] ) From 7f388fe833a6cc67ce74db13c7c2021b6bedfcb4 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:22:17 -0600 Subject: [PATCH 39/58] chore(deps): update dependency rules_xcodeproj to v2.9.2 (#1348) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_xcodeproj | bazel_dep | patch | `2.9.1` -> `2.9.2` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/firebase_example/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 62339bd1b..4ef18a137 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -26,7 +26,7 @@ bazel_dep( bazel_dep( name = "rules_xcodeproj", - version = "2.9.1", + version = "2.9.2", dev_dependency = True, ) bazel_dep( diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index 63d71a2b8..a5d49f6e8 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -37,7 +37,7 @@ bazel_dep( ) bazel_dep( name = "rules_xcodeproj", - version = "2.9.1", + version = "2.9.2", dev_dependency = True, ) From 9149af64a387743770fb1249522e8df5282287e0 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 07:18:11 -0700 Subject: [PATCH 40/58] chore(deps): update dependency onevcat/kingfisher to from: "8.1.1" (#1350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [onevcat/Kingfisher](https://redirect.github.com/onevcat/Kingfisher) | patch | `from: "8.1.0"` -> `from: "8.1.1"` | --- ### Release Notes
onevcat/Kingfisher (onevcat/Kingfisher) ### [`v8.1.1`](https://redirect.github.com/onevcat/Kingfisher/blob/HEAD/CHANGELOG.md#811---Clean-Completion-2024-11-20) [Compare Source](https://redirect.github.com/onevcat/Kingfisher/compare/8.1.0...8.1.1) ##### Fix - Resolved an issue where the completion handler could be called multiple times under certain circumstances, potentially leading to crashes if the download task is cancelled. [#​2319](https://redirect.github.com/onevcat/Kingfisher/pull/2319) [@​onevcat](https://redirect.github.com/onevcat) ***
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/messagekit_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/messagekit_example/Package.swift b/examples/messagekit_example/Package.swift index ba4b46f99..8eb72947e 100644 --- a/examples/messagekit_example/Package.swift +++ b/examples/messagekit_example/Package.swift @@ -6,6 +6,6 @@ let package = Package( name: "messagekit_example", dependencies: [ .package(url: "https://github.com/MessageKit/MessageKit", from: "4.3.0"), - .package(url: "https://github.com/onevcat/Kingfisher", from: "8.1.0"), + .package(url: "https://github.com/onevcat/Kingfisher", from: "8.1.1"), ] ) From bb497e2633bd6cfa248464f1ec31c0428ad24dc8 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 07:17:32 -0700 Subject: [PATCH 41/58] chore(deps): update dependency nicklockwood/swiftformat to from: "0.55.1" (#1351) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [nicklockwood/SwiftFormat](https://redirect.github.com/nicklockwood/SwiftFormat) | patch | `from: "0.55.0"` -> `from: "0.55.1"` | --- ### Release Notes
nicklockwood/SwiftFormat (nicklockwood/SwiftFormat) ### [`v0.55.1`](https://redirect.github.com/nicklockwood/SwiftFormat/blob/HEAD/CHANGELOG.md#0551-2024-11-20) [Compare Source](https://redirect.github.com/nicklockwood/SwiftFormat/compare/0.55.0...0.55.1) - Fixed bug where `docCommentsBeforeModifiers` got confused by `enum` cases that match modifier names - Fixed bug where `wrapEnumCases` would mangle nested or successive `enum` declarations - Artifact Bundle now includes pre-built binary for ARM-based Linux systems
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/pkg_manifest_minimal/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pkg_manifest_minimal/Package.swift b/examples/pkg_manifest_minimal/Package.swift index 9cac134c3..3fcfad657 100644 --- a/examples/pkg_manifest_minimal/Package.swift +++ b/examples/pkg_manifest_minimal/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.0"), + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.1"), .package(path: "third_party/my_local_package"), .package(path: "third_party/NotThatAmazingModule"), ] From 5a8f195852d86cd2711b1eb973ff0b50c4f3977d Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 07:27:52 -0700 Subject: [PATCH 42/58] chore(deps): update dependency vapor/vapor to v4.106.4 (#1352) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.3` -> `4.106.4` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.4`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.4): - Use application's logger in InMemory tester [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.3...4.106.4) #### What's Changed Use application's logger in InMemory tester by [@​sidepelican](https://redirect.github.com/sidepelican) in [#​3239](https://redirect.github.com/vapor/vapor/issues/3239) > Usually, a copy of the application’s Logger is passed to the `Request`. However, for the `InMemory` part of `XCTApplicationTester`, it seems the default Logger is used. > This PR fix the behavior so that the application’s Logger is used instead of the default one. #### Reviewers Thanks to the reviewers for their help: - [@​Naveen-C-Ramachandrappa](https://redirect.github.com/Naveen-C-Ramachandrappa) ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.3...4.106.4
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index b09888a9d..680b157b7 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.3"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.4"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From ce24cbad0df48ea7418b1be9bbf8de46ee04404f Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 14:45:12 +0000 Subject: [PATCH 43/58] fix(deps): update module github.com/stretchr/testify to v1.10.0 (#1354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/stretchr/testify](https://redirect.github.com/stretchr/testify) | require | minor | `v1.9.0` -> `v1.10.0` | --- ### Release Notes
stretchr/testify (github.com/stretchr/testify) ### [`v1.10.0`](https://redirect.github.com/stretchr/testify/releases/tag/v1.10.0) [Compare Source](https://redirect.github.com/stretchr/testify/compare/v1.9.0...v1.10.0) #### What's Changed ##### Functional Changes - Add PanicAssertionFunc by [@​fahimbagar](https://redirect.github.com/fahimbagar) in [https://github.com/stretchr/testify/pull/1337](https://redirect.github.com/stretchr/testify/pull/1337) - assert: deprecate CompareType by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1566](https://redirect.github.com/stretchr/testify/pull/1566) - assert: make YAML dependency pluggable via build tags by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1579](https://redirect.github.com/stretchr/testify/pull/1579) - assert: new assertion NotElementsMatch by [@​hendrywiranto](https://redirect.github.com/hendrywiranto) in [https://github.com/stretchr/testify/pull/1600](https://redirect.github.com/stretchr/testify/pull/1600) - mock: in order mock calls by [@​ReyOrtiz](https://redirect.github.com/ReyOrtiz) in [https://github.com/stretchr/testify/pull/1637](https://redirect.github.com/stretchr/testify/pull/1637) - Add assertion for NotErrorAs by [@​palsivertsen](https://redirect.github.com/palsivertsen) in [https://github.com/stretchr/testify/pull/1129](https://redirect.github.com/stretchr/testify/pull/1129) - Record Return Arguments of a Call by [@​jayd3e](https://redirect.github.com/jayd3e) in [https://github.com/stretchr/testify/pull/1636](https://redirect.github.com/stretchr/testify/pull/1636) - assert.EqualExportedValues: accepts everything by [@​redachl](https://redirect.github.com/redachl) in [https://github.com/stretchr/testify/pull/1586](https://redirect.github.com/stretchr/testify/pull/1586) ##### Fixes - assert: make tHelper a type alias by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1562](https://redirect.github.com/stretchr/testify/pull/1562) - Do not get argument again unnecessarily in Arguments.Error() by [@​TomWright](https://redirect.github.com/TomWright) in [https://github.com/stretchr/testify/pull/820](https://redirect.github.com/stretchr/testify/pull/820) - Fix time.Time compare by [@​myxo](https://redirect.github.com/myxo) in [https://github.com/stretchr/testify/pull/1582](https://redirect.github.com/stretchr/testify/pull/1582) - assert.Regexp: handle \[]byte array properly by [@​kevinburkesegment](https://redirect.github.com/kevinburkesegment) in [https://github.com/stretchr/testify/pull/1587](https://redirect.github.com/stretchr/testify/pull/1587) - assert: collect.FailNow() should not panic by [@​marshall-lee](https://redirect.github.com/marshall-lee) in [https://github.com/stretchr/testify/pull/1481](https://redirect.github.com/stretchr/testify/pull/1481) - mock: simplify implementation of FunctionalOptions by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1571](https://redirect.github.com/stretchr/testify/pull/1571) - mock: caller information for unexpected method call by [@​spirin](https://redirect.github.com/spirin) in [https://github.com/stretchr/testify/pull/1644](https://redirect.github.com/stretchr/testify/pull/1644) - suite: fix test failures by [@​stevenh](https://redirect.github.com/stevenh) in [https://github.com/stretchr/testify/pull/1421](https://redirect.github.com/stretchr/testify/pull/1421) - Fix issue [#​1662](https://redirect.github.com/stretchr/testify/issues/1662) (comparing infs should fail) by [@​ybrustin](https://redirect.github.com/ybrustin) in [https://github.com/stretchr/testify/pull/1663](https://redirect.github.com/stretchr/testify/pull/1663) - NotSame should fail if args are not pointers [#​1661](https://redirect.github.com/stretchr/testify/issues/1661) by [@​sikehish](https://redirect.github.com/sikehish) in [https://github.com/stretchr/testify/pull/1664](https://redirect.github.com/stretchr/testify/pull/1664) - Increase timeouts in Test_Mock_Called_blocks to reduce flakiness in CI by [@​sikehish](https://redirect.github.com/sikehish) in [https://github.com/stretchr/testify/pull/1667](https://redirect.github.com/stretchr/testify/pull/1667) - fix: compare functional option names for indirect calls by [@​arjun-1](https://redirect.github.com/arjun-1) in [https://github.com/stretchr/testify/pull/1626](https://redirect.github.com/stretchr/testify/pull/1626) ##### Documantation, Build & CI - .gitignore: ignore "go test -c" binaries by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1565](https://redirect.github.com/stretchr/testify/pull/1565) - mock: improve doc by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1570](https://redirect.github.com/stretchr/testify/pull/1570) - mock: fix FunctionalOptions docs by [@​snirye](https://redirect.github.com/snirye) in [https://github.com/stretchr/testify/pull/1433](https://redirect.github.com/stretchr/testify/pull/1433) - README: link out to the excellent testifylint by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1568](https://redirect.github.com/stretchr/testify/pull/1568) - assert: fix typo in comment by [@​JohnEndson](https://redirect.github.com/JohnEndson) in [https://github.com/stretchr/testify/pull/1580](https://redirect.github.com/stretchr/testify/pull/1580) - Correct the EventuallyWithT and EventuallyWithTf example by [@​JonCrowther](https://redirect.github.com/JonCrowther) in [https://github.com/stretchr/testify/pull/1588](https://redirect.github.com/stretchr/testify/pull/1588) - CI: bump softprops/action-gh-release from 1 to 2 by [@​dependabot](https://redirect.github.com/dependabot) in [https://github.com/stretchr/testify/pull/1575](https://redirect.github.com/stretchr/testify/pull/1575) - mock: document more alternatives to deprecated AnythingOfTypeArgument by [@​dolmen](https://redirect.github.com/dolmen) in [https://github.com/stretchr/testify/pull/1569](https://redirect.github.com/stretchr/testify/pull/1569) - assert: Correctly document EqualValues behavior by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1593](https://redirect.github.com/stretchr/testify/pull/1593) - fix: grammar in godoc by [@​miparnisari](https://redirect.github.com/miparnisari) in [https://github.com/stretchr/testify/pull/1607](https://redirect.github.com/stretchr/testify/pull/1607) - .github/workflows: Run tests for Go 1.22 by [@​HaraldNordgren](https://redirect.github.com/HaraldNordgren) in [https://github.com/stretchr/testify/pull/1629](https://redirect.github.com/stretchr/testify/pull/1629) - Document suite's lack of support for t.Parallel by [@​brackendawson](https://redirect.github.com/brackendawson) in [https://github.com/stretchr/testify/pull/1645](https://redirect.github.com/stretchr/testify/pull/1645) - assert: fix typos in comments by [@​alexandear](https://redirect.github.com/alexandear) in [https://github.com/stretchr/testify/pull/1650](https://redirect.github.com/stretchr/testify/pull/1650) - mock: fix doc comment for NotBefore by [@​alexandear](https://redirect.github.com/alexandear) in [https://github.com/stretchr/testify/pull/1651](https://redirect.github.com/stretchr/testify/pull/1651) - Generate better comments for require package by [@​Neokil](https://redirect.github.com/Neokil) in [https://github.com/stretchr/testify/pull/1610](https://redirect.github.com/stretchr/testify/pull/1610) - README: replace Testify V2 notice with [@​dolmen](https://redirect.github.com/dolmen)'s V2 manifesto by [@​hendrywiranto](https://redirect.github.com/hendrywiranto) in [https://github.com/stretchr/testify/pull/1518](https://redirect.github.com/stretchr/testify/pull/1518) #### New Contributors - [@​fahimbagar](https://redirect.github.com/fahimbagar) made their first contribution in [https://github.com/stretchr/testify/pull/1337](https://redirect.github.com/stretchr/testify/pull/1337) - [@​TomWright](https://redirect.github.com/TomWright) made their first contribution in [https://github.com/stretchr/testify/pull/820](https://redirect.github.com/stretchr/testify/pull/820) - [@​snirye](https://redirect.github.com/snirye) made their first contribution in [https://github.com/stretchr/testify/pull/1433](https://redirect.github.com/stretchr/testify/pull/1433) - [@​myxo](https://redirect.github.com/myxo) made their first contribution in [https://github.com/stretchr/testify/pull/1582](https://redirect.github.com/stretchr/testify/pull/1582) - [@​JohnEndson](https://redirect.github.com/JohnEndson) made their first contribution in [https://github.com/stretchr/testify/pull/1580](https://redirect.github.com/stretchr/testify/pull/1580) - [@​JonCrowther](https://redirect.github.com/JonCrowther) made their first contribution in [https://github.com/stretchr/testify/pull/1588](https://redirect.github.com/stretchr/testify/pull/1588) - [@​miparnisari](https://redirect.github.com/miparnisari) made their first contribution in [https://github.com/stretchr/testify/pull/1607](https://redirect.github.com/stretchr/testify/pull/1607) - [@​marshall-lee](https://redirect.github.com/marshall-lee) made their first contribution in [https://github.com/stretchr/testify/pull/1481](https://redirect.github.com/stretchr/testify/pull/1481) - [@​spirin](https://redirect.github.com/spirin) made their first contribution in [https://github.com/stretchr/testify/pull/1644](https://redirect.github.com/stretchr/testify/pull/1644) - [@​ReyOrtiz](https://redirect.github.com/ReyOrtiz) made their first contribution in [https://github.com/stretchr/testify/pull/1637](https://redirect.github.com/stretchr/testify/pull/1637) - [@​stevenh](https://redirect.github.com/stevenh) made their first contribution in [https://github.com/stretchr/testify/pull/1421](https://redirect.github.com/stretchr/testify/pull/1421) - [@​jayd3e](https://redirect.github.com/jayd3e) made their first contribution in [https://github.com/stretchr/testify/pull/1636](https://redirect.github.com/stretchr/testify/pull/1636) - [@​Neokil](https://redirect.github.com/Neokil) made their first contribution in [https://github.com/stretchr/testify/pull/1610](https://redirect.github.com/stretchr/testify/pull/1610) - [@​redachl](https://redirect.github.com/redachl) made their first contribution in [https://github.com/stretchr/testify/pull/1586](https://redirect.github.com/stretchr/testify/pull/1586) - [@​ybrustin](https://redirect.github.com/ybrustin) made their first contribution in [https://github.com/stretchr/testify/pull/1663](https://redirect.github.com/stretchr/testify/pull/1663) - [@​sikehish](https://redirect.github.com/sikehish) made their first contribution in [https://github.com/stretchr/testify/pull/1664](https://redirect.github.com/stretchr/testify/pull/1664) - [@​arjun-1](https://redirect.github.com/arjun-1) made their first contribution in [https://github.com/stretchr/testify/pull/1626](https://redirect.github.com/stretchr/testify/pull/1626) **Full Changelog**: https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- go_deps.bzl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 877cda77f..f091c52e3 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/creasty/defaults v1.8.0 github.com/deckarep/golang-set/v2 v2.6.0 github.com/spf13/cobra v1.8.1 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f golang.org/x/text v0.20.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 78c01ea5a..f2140231e 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -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= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= diff --git a/go_deps.bzl b/go_deps.bzl index 27b9ebb99..c4475bdcb 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -147,8 +147,8 @@ def swift_bazel_go_dependencies(): name = "com_github_stretchr_testify", build_external = "external", importpath = "github.com/stretchr/testify", - sum = "h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=", - version = "v1.9.0", + sum = "h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=", + version = "v1.10.0", ) maybe( go_repository, From 21dfdc5f93c268af966d494ece025b4bd511a70c Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 15:28:40 +0000 Subject: [PATCH 44/58] chore(deps): update dependency stripe/stripe-ios to from: "24.0.1" (#1349) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [stripe/stripe-ios](https://redirect.github.com/stripe/stripe-ios) | patch | `from: "24.0.0"` -> `from: "24.0.1"` | --- ### Release Notes
stripe/stripe-ios (stripe/stripe-ios) ### [`v24.0.1`](https://redirect.github.com/stripe/stripe-ios/blob/HEAD/CHANGELOG.md#2401-2024-11-18) [Compare Source](https://redirect.github.com/stripe/stripe-ios/compare/24.0.0...24.0.1) ##### PaymentSheet - \[Added] Instant Bank Payments are now available when using deferred intents. - \[Fixed] Fixed an issue with the vertical list with 3 or more saved payment methods where tapping outside the screen sometimes drops changes that were made (e.g. removal or update of PMs). - \[Fixed] Fixed an issue where the dialog when removing a co-branded card may show the incorrect card brand. - \[Fixed] Fixed issue preventing users to enter in 4 digit account numbers for AU Becs.
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/stripe_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/stripe_example/Package.swift b/examples/stripe_example/Package.swift index fabecd4c8..b89bc0bf0 100644 --- a/examples/stripe_example/Package.swift +++ b/examples/stripe_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/stripe/stripe-ios", - from: "24.0.0" + from: "24.0.1" ), ] ) From 4ef0baf2f0c53676c1e9a4e048f2b27776be41f6 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 15:59:26 +0000 Subject: [PATCH 45/58] chore(deps): update dependency soto-project/soto to from: "7.2.0" (#1347) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [soto-project/soto](https://redirect.github.com/soto-project/soto) | minor | `from: "7.1.0"` -> `from: "7.2.0"` | --- ### Release Notes
soto-project/soto (soto-project/soto) ### [`v7.2.0`](https://redirect.github.com/soto-project/soto/releases/tag/7.2.0) [Compare Source](https://redirect.github.com/soto-project/soto/compare/7.1.0...7.2.0) Using soto-core [v7.2.0](https://redirect.github.com/soto-project/soto-core/releases/tag/7.2.0) Using AWS models from [aws-sdk-go-v2 release-2024-11-15.2](https://redirect.github.com/aws/aws-sdk-go-v2/releases/tag/release-2024-11-15.2)
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel --- examples/soto_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/soto_example/Package.swift b/examples/soto_example/Package.swift index df9c4c653..a165cdd8d 100644 --- a/examples/soto_example/Package.swift +++ b/examples/soto_example/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "PhoneNumberKitExample", dependencies: [ - .package(url: "https://github.com/soto-project/soto.git", from: "7.1.0"), + .package(url: "https://github.com/soto-project/soto.git", from: "7.2.0"), ] ) From 4454b3d93e7265cb6c8dcbdfaed4c665209fe2d7 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 16:15:04 +0000 Subject: [PATCH 46/58] chore(deps): update dependency rules_swift to v2.2.4 (#1353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | rules_swift | bazel_dep | patch | `2.2.3` -> `2.2.4` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). --------- Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: Chuck Grindel Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- bzlmod/workspace/MODULE.bazel | 2 +- examples/firebase_example/MODULE.bazel | 2 +- examples/google_maps_example/MODULE.bazel | 2 +- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- examples/interesting_deps/MODULE.bazel | 2 +- examples/ios_sim/MODULE.bazel | 2 +- examples/lottie_ios_example/MODULE.bazel | 2 +- examples/messagekit_example/MODULE.bazel | 2 +- examples/nimble_example/MODULE.bazel | 2 +- examples/objc_code/MODULE.bazel | 2 +- examples/phone_number_kit/MODULE.bazel | 2 +- examples/pkg_manifest_minimal/MODULE.bazel | 2 +- examples/resources_example/MODULE.bazel | 2 +- examples/shake_ios_example/MODULE.bazel | 2 +- examples/snapkit_example/MODULE.bazel | 2 +- examples/soto_example/MODULE.bazel | 2 +- examples/stripe_example/MODULE.bazel | 2 +- examples/symlink_example/MODULE.bazel | 2 +- examples/tca_example/MODULE.bazel | 2 +- examples/vapor_example/MODULE.bazel | 2 +- examples/xcmetrics_example/MODULE.bazel | 2 +- tools/create_example/template_files/MODULE.bazel | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel index d872fd1c0..59695105c 100644 --- a/bzlmod/workspace/MODULE.bazel +++ b/bzlmod/workspace/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel index 4ef18a137..5f9bf8888 100644 --- a/examples/firebase_example/MODULE.bazel +++ b/examples/firebase_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/google_maps_example/MODULE.bazel b/examples/google_maps_example/MODULE.bazel index 8fe6b1158..8d90584ed 100644 --- a/examples/google_maps_example/MODULE.bazel +++ b/examples/google_maps_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 121658060..8e5ee5b7d 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 121658060..8e5ee5b7d 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -19,7 +19,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index 514a4a974..407873ac2 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel index a5d49f6e8..4685e4de0 100644 --- a/examples/ios_sim/MODULE.bazel +++ b/examples/ios_sim/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel index f8e63dc09..f93b73220 100644 --- a/examples/lottie_ios_example/MODULE.bazel +++ b/examples/lottie_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel index cd9670a00..9f92ac160 100644 --- a/examples/messagekit_example/MODULE.bazel +++ b/examples/messagekit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel index ef2727b81..318c3c3c0 100644 --- a/examples/nimble_example/MODULE.bazel +++ b/examples/nimble_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel index e09013b4f..077ba20bc 100644 --- a/examples/objc_code/MODULE.bazel +++ b/examples/objc_code/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel index a7f11c6bd..ac7aaeafd 100644 --- a/examples/phone_number_kit/MODULE.bazel +++ b/examples/phone_number_kit/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel index d7468f417..764edf9ee 100644 --- a/examples/pkg_manifest_minimal/MODULE.bazel +++ b/examples/pkg_manifest_minimal/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel index cb660fb23..031c4b607 100644 --- a/examples/resources_example/MODULE.bazel +++ b/examples/resources_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel index cb0131e2c..95218280a 100644 --- a/examples/shake_ios_example/MODULE.bazel +++ b/examples/shake_ios_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel index 06a59108d..e3ee4c0b2 100644 --- a/examples/snapkit_example/MODULE.bazel +++ b/examples/snapkit_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel index bdb961718..f5ec5cdf4 100644 --- a/examples/soto_example/MODULE.bazel +++ b/examples/soto_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel index ff8cab54f..f498b1cb5 100644 --- a/examples/stripe_example/MODULE.bazel +++ b/examples/stripe_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/symlink_example/MODULE.bazel b/examples/symlink_example/MODULE.bazel index 12b812c45..da27e71df 100644 --- a/examples/symlink_example/MODULE.bazel +++ b/examples/symlink_example/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel index 13ed10a36..159517838 100644 --- a/examples/tca_example/MODULE.bazel +++ b/examples/tca_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep( ) bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel index 4cd714caf..28514e03d 100644 --- a/examples/vapor_example/MODULE.bazel +++ b/examples/vapor_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel index a3fe88f95..25f00d54b 100644 --- a/examples/xcmetrics_example/MODULE.bazel +++ b/examples/xcmetrics_example/MODULE.bazel @@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) diff --git a/tools/create_example/template_files/MODULE.bazel b/tools/create_example/template_files/MODULE.bazel index 228b9bef7..047595f06 100644 --- a/tools/create_example/template_files/MODULE.bazel +++ b/tools/create_example/template_files/MODULE.bazel @@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "apple_support", version = "1.17.1") bazel_dep( name = "rules_swift", - version = "2.2.3", + version = "2.2.4", repo_name = "build_bazel_rules_swift", ) bazel_dep( From 6ced81ab97eaa8643868d908a5cc2549d99aaa9a Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 07:37:19 -0700 Subject: [PATCH 47/58] chore(deps): update dependency stripe/stripe-ios to from: "24.0.2" (#1355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [stripe/stripe-ios](https://redirect.github.com/stripe/stripe-ios) | patch | `from: "24.0.1"` -> `from: "24.0.2"` | --- ### Release Notes
stripe/stripe-ios (stripe/stripe-ios) ### [`v24.0.2`](https://redirect.github.com/stripe/stripe-ios/blob/HEAD/CHANGELOG.md#2402-2024-11-21) [Compare Source](https://redirect.github.com/stripe/stripe-ios/compare/24.0.1...24.0.2) ##### PaymentSheet - \[Fixed] A bug where PaymentSheet would cause layout issues when nested within certain navigation stacks.
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/stripe_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/stripe_example/Package.swift b/examples/stripe_example/Package.swift index b89bc0bf0..89cb55919 100644 --- a/examples/stripe_example/Package.swift +++ b/examples/stripe_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/stripe/stripe-ios", - from: "24.0.1" + from: "24.0.2" ), ] ) From 75f67e948af3d031914a512e2fbcf4f0c43b55c6 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:53:05 +0000 Subject: [PATCH 48/58] chore(deps): update dependency nicklockwood/swiftformat to from: "0.55.2" (#1356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [nicklockwood/SwiftFormat](https://redirect.github.com/nicklockwood/SwiftFormat) | patch | `from: "0.55.1"` -> `from: "0.55.2"` | --- ### Release Notes
nicklockwood/SwiftFormat (nicklockwood/SwiftFormat) ### [`v0.55.2`](https://redirect.github.com/nicklockwood/SwiftFormat/blob/HEAD/CHANGELOG.md#0552-2024-11-24) [Compare Source](https://redirect.github.com/nicklockwood/SwiftFormat/compare/0.55.1...0.55.2) - Fixed bug where `unusedArguments` failed to remove arguments that matched switch variable bindings - Fixed bug where `unusedArguments` failed to remove arguments that matched nested function call labels - Fixed spurious lint errors for `blankLinesAtStartOfScope` when using `organizeDeclarations` rule - Fixed bug where indentation errors were incorrectly reported as `wrap` rule lint errors - The `preferKeyPaths` rule now handles the `\\.self` case for Swift 5.10 and later - Fixed parsing of keyPaths beginning with `\.?`
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/pkg_manifest_minimal/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pkg_manifest_minimal/Package.swift b/examples/pkg_manifest_minimal/Package.swift index 3fcfad657..097485854 100644 --- a/examples/pkg_manifest_minimal/Package.swift +++ b/examples/pkg_manifest_minimal/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.1"), + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.2"), .package(path: "third_party/my_local_package"), .package(path: "third_party/NotThatAmazingModule"), ] From 667c35752d0367f12cdc51e982f1b807f9cc4145 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 07:09:10 -0700 Subject: [PATCH 49/58] chore(deps): update dependency marmelroy/phonenumberkit to from: "4.0.1" (#1357) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [marmelroy/PhoneNumberKit](https://redirect.github.com/marmelroy/PhoneNumberKit) | patch | `from: "4.0.0"` -> `from: "4.0.1"` | --- ### Release Notes
marmelroy/PhoneNumberKit (marmelroy/PhoneNumberKit) ### [`v4.0.1`](https://redirect.github.com/marmelroy/PhoneNumberKit/releases/tag/4.0.1) [Compare Source](https://redirect.github.com/marmelroy/PhoneNumberKit/compare/4.0.0...4.0.1) #### What's Changed - Fix regex parsing by [@​bguidolim](https://redirect.github.com/bguidolim) in [https://github.com/marmelroy/PhoneNumberKit/pull/799](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/799) - Updated metadata to version metadata/8.13.44 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/800](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/800) - Updated metadata to version metadata/8.13.45 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/803](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/803) - Updated metadata to version metadata/8.13.46 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/806](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/806) - Updated metadata to version metadata/8.13.47 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/807](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/807) - Fix generalError description typo by [@​EmirhanKarahan](https://redirect.github.com/EmirhanKarahan) in [https://github.com/marmelroy/PhoneNumberKit/pull/808](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/808) - Updated metadata to version metadata/8.13.48 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/810](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/810) - Updated metadata to version metadata/8.13.49 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/813](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/813) - Updated metadata to version metadata/8.13.50 by [@​github-actions](https://redirect.github.com/github-actions) in [https://github.com/marmelroy/PhoneNumberKit/pull/816](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/816) #### New Contributors - [@​EmirhanKarahan](https://redirect.github.com/EmirhanKarahan) made their first contribution in [https://github.com/marmelroy/PhoneNumberKit/pull/808](https://redirect.github.com/marmelroy/PhoneNumberKit/pull/808) **Full Changelog**: https://github.com/marmelroy/PhoneNumberKit/compare/4.0.0...4.0.1
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/phone_number_kit/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/phone_number_kit/Package.swift b/examples/phone_number_kit/Package.swift index 5996fb9f0..25bc4184d 100644 --- a/examples/phone_number_kit/Package.swift +++ b/examples/phone_number_kit/Package.swift @@ -5,6 +5,6 @@ import PackageDescription let package = Package( name: "PhoneNumberKitExample", dependencies: [ - .package(url: "https://github.com/marmelroy/PhoneNumberKit", from: "4.0.0"), + .package(url: "https://github.com/marmelroy/PhoneNumberKit", from: "4.0.1"), ] ) From e5c73a4f5bbdc138d5d995b86f7ca630ac16f746 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:23:21 +0000 Subject: [PATCH 50/58] chore(deps): update dependency stripe/stripe-ios to from: "24.1.0" (#1358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [stripe/stripe-ios](https://redirect.github.com/stripe/stripe-ios) | minor | `from: "24.0.2"` -> `from: "24.1.0"` | --- ### Release Notes
stripe/stripe-ios (stripe/stripe-ios) ### [`v24.1.0`](https://redirect.github.com/stripe/stripe-ios/blob/HEAD/CHANGELOG.md#2410-2024-11-25) [Compare Source](https://redirect.github.com/stripe/stripe-ios/compare/24.0.2...24.1.0) ##### Payments - \[Added] Support for Crypto bindings. ##### PaymentSheet - \[Fixed] US Bank Account now shows the correct mandate when using the `instant_or_skip` verification method.
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/stripe_example/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/stripe_example/Package.swift b/examples/stripe_example/Package.swift index 89cb55919..6377649d0 100644 --- a/examples/stripe_example/Package.swift +++ b/examples/stripe_example/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/stripe/stripe-ios", - from: "24.0.2" + from: "24.1.0" ), ] ) From 3f9d430f39c057cc6925e00b93b61e9f3cd31f18 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 06:41:14 -0700 Subject: [PATCH 51/58] chore(deps): update dependency apple/swift-log to from: "1.6.2" (#1359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [apple/swift-log](https://redirect.github.com/apple/swift-log) | patch | `from: "1.6.1"` -> `from: "1.6.2"` | --- ### Release Notes
apple/swift-log (apple/swift-log) ### [`v1.6.2`](https://redirect.github.com/apple/swift-log/releases/tag/1.6.2) [Compare Source](https://redirect.github.com/apple/swift-log/compare/1.6.1...1.6.2) ##### What's Changed ##### SemVer Patch - Fix Windows warnings by [@​FranzBusch](https://redirect.github.com/FranzBusch) in [https://github.com/apple/swift-log/pull/331](https://redirect.github.com/apple/swift-log/pull/331) ##### Other Changes - \[CI] Migrate to GHA by [@​FranzBusch](https://redirect.github.com/FranzBusch) in [https://github.com/apple/swift-log/pull/328](https://redirect.github.com/apple/swift-log/pull/328) - Enhance swift code-block at README.md by [@​lamtrinhdev](https://redirect.github.com/lamtrinhdev) in [https://github.com/apple/swift-log/pull/327](https://redirect.github.com/apple/swift-log/pull/327) - add .editorconfig file by [@​rnro](https://redirect.github.com/rnro) in [https://github.com/apple/swift-log/pull/338](https://redirect.github.com/apple/swift-log/pull/338) - Add Scout to the list of available backends by [@​kasianov-mikhail](https://redirect.github.com/kasianov-mikhail) in [https://github.com/apple/swift-log/pull/337](https://redirect.github.com/apple/swift-log/pull/337) ##### New Contributors - [@​lamtrinhdev](https://redirect.github.com/lamtrinhdev) made their first contribution in [https://github.com/apple/swift-log/pull/318](https://redirect.github.com/apple/swift-log/pull/318) - [@​hyp](https://redirect.github.com/hyp) made their first contribution in [https://github.com/apple/swift-log/pull/325](https://redirect.github.com/apple/swift-log/pull/325) - [@​rnro](https://redirect.github.com/rnro) made their first contribution in [https://github.com/apple/swift-log/pull/338](https://redirect.github.com/apple/swift-log/pull/338) - [@​kasianov-mikhail](https://redirect.github.com/kasianov-mikhail) made their first contribution in [https://github.com/apple/swift-log/pull/337](https://redirect.github.com/apple/swift-log/pull/337) **Full Changelog**: https://github.com/apple/swift-log/compare/1.6.1...1.6.2
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- bzlmod/workspace/Package.swift | 2 +- examples/interesting_deps/Package.swift | 2 +- examples/pkg_manifest_minimal/Package.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bzlmod/workspace/Package.swift b/bzlmod/workspace/Package.swift index ac9954a7a..10b8f0a8e 100644 --- a/bzlmod/workspace/Package.swift +++ b/bzlmod/workspace/Package.swift @@ -9,7 +9,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), - .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), + .package(url: "https://github.com/apple/swift-log", from: "1.6.2"), ], targets: [ .executableTarget( diff --git a/examples/interesting_deps/Package.swift b/examples/interesting_deps/Package.swift index 6b78de7b5..0dae0a77d 100644 --- a/examples/interesting_deps/Package.swift +++ b/examples/interesting_deps/Package.swift @@ -9,6 +9,6 @@ let package = Package( .package(url: "https://github.com/GEOSwift/GEOSwift", from: "11.0.0"), .package(url: "https://github.com/OpenCombine/OpenCombine", from: "0.14.0"), .package(url: "https://github.com/SDWebImage/libwebp-Xcode.git", from: "1.3.2"), - .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), + .package(url: "https://github.com/apple/swift-log", from: "1.6.2"), ] ) diff --git a/examples/pkg_manifest_minimal/Package.swift b/examples/pkg_manifest_minimal/Package.swift index 097485854..bd91d1be5 100644 --- a/examples/pkg_manifest_minimal/Package.swift +++ b/examples/pkg_manifest_minimal/Package.swift @@ -6,7 +6,7 @@ let package = Package( name: "MySwiftPackage", dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), - .package(url: "https://github.com/apple/swift-log", from: "1.6.1"), + .package(url: "https://github.com/apple/swift-log", from: "1.6.2"), .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.2"), .package(path: "third_party/my_local_package"), .package(path: "third_party/NotThatAmazingModule"), From 257bc26862b1d1b4b875f9f6381a43d55d57a566 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:56:58 +0000 Subject: [PATCH 52/58] chore(deps): update dependency apple/swift-nio to v2.77.0 (#1362) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [apple/swift-nio](https://redirect.github.com/apple/swift-nio) | minor | `2.76.1` -> `2.77.0` | --- ### Release Notes
apple/swift-nio (apple/swift-nio) ### [`v2.77.0`](https://redirect.github.com/apple/swift-nio/releases/tag/2.77.0): SwiftNIO 2.77.0 [Compare Source](https://redirect.github.com/apple/swift-nio/compare/2.76.1...2.77.0) #### What's Changed ##### SemVer Minor - Add new protocol for ChannelHandler to get buffered bytes in the channel handler by [@​johnnzhou](https://redirect.github.com/johnnzhou) in [https://github.com/apple/swift-nio/pull/2918](https://redirect.github.com/apple/swift-nio/pull/2918) - Add WebSocketFrame.reservedBits OptionSet by [@​adam-fowler](https://redirect.github.com/adam-fowler) in [https://github.com/apple/swift-nio/pull/2971](https://redirect.github.com/apple/swift-nio/pull/2971) - Add ByteBuffer methods getUTF8ValidatedString and readUTF8ValidatedString by [@​adam-fowler](https://redirect.github.com/adam-fowler) in [https://github.com/apple/swift-nio/pull/2973](https://redirect.github.com/apple/swift-nio/pull/2973) - EventLoopFuture.waitSpinningRunLoop() by [@​weissi](https://redirect.github.com/weissi) in [https://github.com/apple/swift-nio/pull/2985](https://redirect.github.com/apple/swift-nio/pull/2985) ##### SemVer Patch - EmbeddedEventLoop/Channel: check correct thread by [@​weissi](https://redirect.github.com/weissi) in [https://github.com/apple/swift-nio/pull/2951](https://redirect.github.com/apple/swift-nio/pull/2951) - Fix `NIOAsyncSequenceProducer` watermark strategy. by [@​FranzBusch](https://redirect.github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2952](https://redirect.github.com/apple/swift-nio/pull/2952) - BaseSocketChannel flushNow IONotificationState changes by [@​rnro](https://redirect.github.com/rnro) in [https://github.com/apple/swift-nio/pull/2954](https://redirect.github.com/apple/swift-nio/pull/2954) - Fix leaking technique by [@​asdf-bro](https://redirect.github.com/asdf-bro) in [https://github.com/apple/swift-nio/pull/2963](https://redirect.github.com/apple/swift-nio/pull/2963) - Use Swift 6.0 docs pipeline by [@​rnro](https://redirect.github.com/rnro) in [https://github.com/apple/swift-nio/pull/2966](https://redirect.github.com/apple/swift-nio/pull/2966) - Remove sendable checking from NIOLock and NIOLockedValueBox by [@​glbrntt](https://redirect.github.com/glbrntt) in [https://github.com/apple/swift-nio/pull/2968](https://redirect.github.com/apple/swift-nio/pull/2968) - Close channel during upgrade, if client closes input by [@​adam-fowler](https://redirect.github.com/adam-fowler) in [https://github.com/apple/swift-nio/pull/2756](https://redirect.github.com/apple/swift-nio/pull/2756) - Use condition variable in NIOThreadPool by [@​glbrntt](https://redirect.github.com/glbrntt) in [https://github.com/apple/swift-nio/pull/2964](https://redirect.github.com/apple/swift-nio/pull/2964) - Better handle ECONNRESET on connected datagram sockets. by [@​Lukasa](https://redirect.github.com/Lukasa) in [https://github.com/apple/swift-nio/pull/2979](https://redirect.github.com/apple/swift-nio/pull/2979) - Only toggle production state when above/below watermark by [@​glbrntt](https://redirect.github.com/glbrntt) in [https://github.com/apple/swift-nio/pull/2996](https://redirect.github.com/apple/swift-nio/pull/2996) - Prevent crash in Happy Eyeballs Resolver by [@​Lukasa](https://redirect.github.com/Lukasa) in [https://github.com/apple/swift-nio/pull/3003](https://redirect.github.com/apple/swift-nio/pull/3003) ##### Other Changes - Fix broken swift format link by [@​ali-ahsan-ali](https://redirect.github.com/ali-ahsan-ali) in [https://github.com/apple/swift-nio/pull/2948](https://redirect.github.com/apple/swift-nio/pull/2948) - Correct allocation test script by [@​PeterAdams-A](https://redirect.github.com/PeterAdams-A) in [https://github.com/apple/swift-nio/pull/2956](https://redirect.github.com/apple/swift-nio/pull/2956) - Remove unused dockerfiles and allocation limit scripts by [@​PeterAdams-A](https://redirect.github.com/PeterAdams-A) in [https://github.com/apple/swift-nio/pull/2957](https://redirect.github.com/apple/swift-nio/pull/2957) - Improve docs around running act for formatting by [@​glbrntt](https://redirect.github.com/glbrntt) in [https://github.com/apple/swift-nio/pull/2965](https://redirect.github.com/apple/swift-nio/pull/2965) - Fix SemVer major label check by [@​FranzBusch](https://redirect.github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2970](https://redirect.github.com/apple/swift-nio/pull/2970) - unify scheduled and main yamls by [@​rnro](https://redirect.github.com/rnro) in [https://github.com/apple/swift-nio/pull/2972](https://redirect.github.com/apple/swift-nio/pull/2972) - remove unused Swift 6 language mode workflow by [@​rnro](https://redirect.github.com/rnro) in [https://github.com/apple/swift-nio/pull/2976](https://redirect.github.com/apple/swift-nio/pull/2976) - Swift 6ify NIOHTTP1Server demo by [@​weissi](https://redirect.github.com/weissi) in [https://github.com/apple/swift-nio/pull/2974](https://redirect.github.com/apple/swift-nio/pull/2974) - Add netstat -s to nio-diagnose by [@​Lukasa](https://redirect.github.com/Lukasa) in [https://github.com/apple/swift-nio/pull/2977](https://redirect.github.com/apple/swift-nio/pull/2977) - tests: Remove asserts on the value of local Vsock CID by [@​simonjbeaumont](https://redirect.github.com/simonjbeaumont) in [https://github.com/apple/swift-nio/pull/2975](https://redirect.github.com/apple/swift-nio/pull/2975) - Add back alloc limits script with JSON mode by [@​Lukasa](https://redirect.github.com/Lukasa) in [https://github.com/apple/swift-nio/pull/2987](https://redirect.github.com/apple/swift-nio/pull/2987) **Full Changelog**: https://github.com/apple/swift-nio/compare/2.76.1...2.77.0
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/ios_sim/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ios_sim/Package.swift b/examples/ios_sim/Package.swift index 5f76e58b5..6e5897c8c 100644 --- a/examples/ios_sim/Package.swift +++ b/examples/ios_sim/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "ios_sim", dependencies: [ - .package(url: "https://github.com/apple/swift-nio.git", exact: "2.76.1"), + .package(url: "https://github.com/apple/swift-nio.git", exact: "2.77.0"), .package(url: "https://github.com/apple/swift-markdown.git", exact: "0.5.0"), ] ) From a5aebc5358c39ae041d22ad6b6ff580bb9448156 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:25:04 +0000 Subject: [PATCH 53/58] chore(deps): update dependency nicklockwood/swiftformat to from: "0.55.3" (#1361) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [nicklockwood/SwiftFormat](https://redirect.github.com/nicklockwood/SwiftFormat) | patch | `from: "0.55.2"` -> `from: "0.55.3"` | --- ### Release Notes
nicklockwood/SwiftFormat (nicklockwood/SwiftFormat) ### [`v0.55.3`](https://redirect.github.com/nicklockwood/SwiftFormat/blob/HEAD/CHANGELOG.md#0553-2024-11-26) [Compare Source](https://redirect.github.com/nicklockwood/SwiftFormat/compare/0.55.2...0.55.3) - Fixed bug where `sortTypealiases` rule could mangle generic types, or ones using the `any` keyword - The `preferKeyPaths` rule now only uses `\\.self` for Swift 6 and later (fix din't land yet in 5.10) - Added speculative fix for plugin `artifactbundle` not working on `ubuntu-latest`
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/pkg_manifest_minimal/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pkg_manifest_minimal/Package.swift b/examples/pkg_manifest_minimal/Package.swift index bd91d1be5..b08ac6837 100644 --- a/examples/pkg_manifest_minimal/Package.swift +++ b/examples/pkg_manifest_minimal/Package.swift @@ -7,7 +7,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"), .package(url: "https://github.com/apple/swift-log", from: "1.6.2"), - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.2"), + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.3"), .package(path: "third_party/my_local_package"), .package(path: "third_party/NotThatAmazingModule"), ] From 1f2a9c662e7dca2ce29b8bad49cf7a1daba104ac Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:31:35 -0700 Subject: [PATCH 54/58] chore(deps): update dependency vapor/vapor to v4.106.5 (#1363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.4` -> `4.106.5` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.5`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.5): - Fix `.noSignalReceived` body streaming crash [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.4...4.106.5) #### What's Changed Fix `.noSignalReceived` body streaming crash by [@​ptoffy](https://redirect.github.com/ptoffy) in [#​3232](https://redirect.github.com/vapor/vapor/issues/3232) > Update SwiftNIO’s minimum version to fix the `preconditionFailure` being thrown in `AsyncSequenceProducerDelegate` #### Reviewers Thanks to the reviewers for their help: - [@​dimitribouniol](https://redirect.github.com/dimitribouniol) ###### *This patch was released by [@​ptoffy](https://redirect.github.com/ptoffy)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.4...4.106.5
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index 680b157b7..697a634b1 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.4"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.5"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From 033273e249e8d9fbaa79e4c17e1161ece390aecd Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:47:44 +0000 Subject: [PATCH 55/58] chore(deps): update dependency protobuf to v29 (#1364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | protobuf | bazel_dep | major | `28.3` -> `29.0` | --- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- examples/grpc_example/MODULE.bazel | 2 +- examples/grpc_package_example/MODULE.bazel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel index 8e5ee5b7d..f674a9390 100644 --- a/examples/grpc_example/MODULE.bazel +++ b/examples/grpc_example/MODULE.bazel @@ -53,7 +53,7 @@ bazel_dep(name = "rules_proto", version = "7.0.2") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. -bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") apple_cc_configure = use_extension( "@apple_support//crosstool:setup.bzl", diff --git a/examples/grpc_package_example/MODULE.bazel b/examples/grpc_package_example/MODULE.bazel index 8e5ee5b7d..f674a9390 100644 --- a/examples/grpc_package_example/MODULE.bazel +++ b/examples/grpc_package_example/MODULE.bazel @@ -53,7 +53,7 @@ bazel_dep(name = "rules_proto", version = "7.0.2") # Gazelle currently needs protobuf to be named com_google_protobuf. # If they fix this, we can remove the repo_name argument. -bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") apple_cc_configure = use_extension( "@apple_support//crosstool:setup.bzl", From 6a78a6d263f0e858adb94d7f7d6c4c94fd03ad70 Mon Sep 17 00:00:00 2001 From: "cgrindel-self-hosted-renovate[bot]" <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:02:34 -0700 Subject: [PATCH 56/58] chore(deps): update dependency vapor/vapor to v4.106.7 (#1365) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [vapor/vapor](https://redirect.github.com/vapor/vapor) | patch | `4.106.5` -> `4.106.7` | --- ### Release Notes
vapor/vapor (vapor/vapor) ### [`v4.106.7`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.7): - Fix typo in ContenConfiguration error [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.6...4.106.7) #### What's Changed Fix typo in ContenConfiguration error by [@​WilliamFernsV3](https://redirect.github.com/WilliamFernsV3) in [#​3259](https://redirect.github.com/vapor/vapor/issues/3259) > Missing single quote in print statement > Added missing closing single quote for print statement. #### New Contributor - [@​WilliamFernsV3](https://redirect.github.com/WilliamFernsV3) made their first contribution in [#​3259](https://redirect.github.com/vapor/vapor/issues/3259) πŸŽ‰ ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.6...4.106.7 ### [`v4.106.6`](https://redirect.github.com/vapor/vapor/releases/tag/4.106.6): - Pass the method, url, and user agent from the ErrorMiddleware to the logger in the metadata. [Compare Source](https://redirect.github.com/vapor/vapor/compare/4.106.5...4.106.6) #### What's Changed Pass the method, url, and user agent from the ErrorMiddleware to the logger in the metadata. by [@​maciejtrybilo](https://redirect.github.com/maciejtrybilo) in [#​3233](https://redirect.github.com/vapor/vapor/issues/3233) > The ErrorMiddleware reports an error to the logger of the request. Sometimes it might be useful to know the endpoint that failed. > > This PR adds the method, url, and user agent of the request in the metadata of the report. #### Reviewers Thanks to the reviewers for their help: - [@​petrpavlik](https://redirect.github.com/petrpavlik) - [@​ptoffy](https://redirect.github.com/ptoffy) ###### *This patch was released by [@​0xTim](https://redirect.github.com/0xTim)* **Full Changelog**: https://github.com/vapor/vapor/compare/4.106.5...4.106.6
--- ### 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://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com> --- examples/vapor_example/swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vapor_example/swift/Package.swift b/examples/vapor_example/swift/Package.swift index 697a634b1..2c2c7967c 100644 --- a/examples/vapor_example/swift/Package.swift +++ b/examples/vapor_example/swift/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "vapor_example", dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.5"), + .package(url: "https://github.com/vapor/vapor.git", exact: "4.106.7"), .package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"), .package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"), ] From f3e31559cd6c404e8649c82d08765f34e2c7fbef Mon Sep 17 00:00:00 2001 From: Luis Padron Date: Mon, 2 Dec 2024 11:45:14 -0500 Subject: [PATCH 57/58] fix: correct issues with modulemap generation (#1360) Fixes duplicate definition errors caused by custom/generated modulemap files. --- docs/faq.md | 16 ---------- examples/firebase_example/.bazelrc | 17 ++-------- examples/interesting_deps/BUILD.bazel | 14 +++++++++ examples/interesting_deps/MODULE.bazel | 6 ++++ examples/interesting_deps/Package.resolved | 21 +++++++++---- examples/interesting_deps/Package.swift | 1 + examples/interesting_deps/do_test | 8 +++-- examples/interesting_deps/objc_test.m | 16 ++++++++++ swiftpkg/internal/swiftpkg_build_files.bzl | 31 +++++++++++++++++-- swiftpkg/tests/swiftpkg_build_files_tests.bzl | 29 +++++++++++++++-- 10 files changed, 114 insertions(+), 45 deletions(-) create mode 100644 examples/interesting_deps/objc_test.m diff --git a/docs/faq.md b/docs/faq.md index ef9a0b779..5d11cdaa2 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -13,7 +13,6 @@ * [After running `//:swift_update_pkgs`, I see a `.build` directory. What is it? Do I need it?](#after-running-swift_update_pkgs-i-see-a-build-directory-what-is-it-do-i-need-it) * [Does the Gazelle plugin run Swift package manager with every execution?](#does-the-gazelle-plugin-run-swift-package-manager-with-every-execution) * [Can I store the Swift dependency files in a sub-package (i.e., not in the root of the workspace)?](#can-i-store-the-swift-dependency-files-in-a-sub-package-ie-not-in-the-root-of-the-workspace) -* [My project builds successfully with `bazel build ...`, but it does not build when using `rules_xcodeproj`. How can I fix this?](#my-project-builds-successfully-with-bazel-build--but-it-does-not-build-when-using-rules_xcodeproj-how-can-i-fix-this) * [Why does this happen?](#why-does-this-happen) * [How do I handle the error `Unable to resolve byName reference XXX in @swiftpkg_yyy.`?](#how-do-i-handle-the-error-unable-to-resolve-byname-reference-xxx-in-swiftpkg_yyy) * [How do I fix this issue?](#how-do-i-fix-this-issue) @@ -94,21 +93,6 @@ the source files that exist in your project to generate the Bazel build files. Yes. The [vapor example] demonstrates storing the Swift dependency files in a sub-package called `swift`. -## My project builds successfully with `bazel build ...`, but it does not build when using `rules_xcodeproj`. How can I fix this? - -tl;dr Add the following to your `.bazelrc`. - -``` -# Ensure that sandboxed is added to the spawn strategy list when building with -# rules_xcodeproj. -build:rules_xcodeproj --spawn_strategy=remote,worker,sandboxed,local -``` - -Alternatively, you can use the [--strategy_regexp] flag to target the relevant targets. For -instance, if `Sources/BranchSDK/BNCContentDiscoveryManager.m` is not building properly, you can -specify `--strategy_regexp="Compiling Sources/BranchSDK/.*=sandboxed"` to use the `sandboxed` strategy -for that file. The regular expression matches on the _description_ for the action. - ### Why does this happen? This can happen with some Swift packages (e.g. `firebase-ios-sdk`). [rules_xcodeproj removes the diff --git a/examples/firebase_example/.bazelrc b/examples/firebase_example/.bazelrc index 070b61fa2..4c7b3c554 100644 --- a/examples/firebase_example/.bazelrc +++ b/examples/firebase_example/.bazelrc @@ -7,8 +7,8 @@ import %workspace%/../../ci.bazelrc # Try to import a local.rc file; typically, written by CI try-import %workspace%/../../local.bazelrc -# NOTE: Puposefully not specifying --copt='-std=c99' as it is applied to -# objc_library targets that contain Objective-C++ files. Tried using +# NOTE: Puposefully not specifying --copt='-std=c99' as it is applied to +# objc_library targets that contain Objective-C++ files. Tried using # --per_file_copt to exclude .mm files, but did not have success. # https://stackoverflow.com/questions/40260242/how-to-set-c-standard-version-when-build-with-bazel/43388168#43388168 # @@ -20,16 +20,3 @@ build --cxxopt='-std=gnu++14' # Firebase SPM support requires `-ObjC` linker option. # https://github.com/firebase/firebase-ios-sdk/blob/master/SwiftPackageManager.md#requirements build --linkopt='-ObjC' - -# Use the sandbox for rules_xcodeproj-specific builds. rules_xcodeproj removes -# the sandboxed spawn strategy (--spawn_strategy=remote,worker,local) by -# default to speed up builds. However, to support setting C/C++ language -# standard flags per target -# (https://github.com/cgrindel/rules_swift_package_manager/issues/1079), we -# need to generate multiple {cc,objc}_library targets based upon the type of -# source files (e.g. C, C++, ObjC, ObjC++). When builds occur outside of the -# sandbox, we can experience "error: duplicate interface definition for class -# 'XXX'" errors. Until we can address the underlying error, clients that use -# rules_swift_package_manager with rules_xcodeproj may need to use sandbox -# builds. -common:rules_xcodeproj --spawn_strategy=remote,worker,sandboxed,local diff --git a/examples/interesting_deps/BUILD.bazel b/examples/interesting_deps/BUILD.bazel index 48b890f01..3b45f5926 100644 --- a/examples/interesting_deps/BUILD.bazel +++ b/examples/interesting_deps/BUILD.bazel @@ -1,4 +1,5 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") +load("@build_bazel_rules_apple//apple:macos.bzl", "macos_unit_test") load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary") load("@cgrindel_bazel_starlib//bzltidy:defs.bzl", "tidy") @@ -46,6 +47,19 @@ swift_binary( ], ) +objc_library( + name = "objc_test.lib", + srcs = ["objc_test.m"], + enable_modules = True, + deps = ["@swiftpkg_ocmock//:OCMock"], +) + +macos_unit_test( + name = "objc_test", + minimum_os_version = "10.15", + deps = [":objc_test.lib"], +) + sh_test( name = "simple_test", srcs = ["simple_test.sh"], diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel index 407873ac2..821123e02 100644 --- a/examples/interesting_deps/MODULE.bazel +++ b/examples/interesting_deps/MODULE.bazel @@ -23,6 +23,11 @@ bazel_dep( version = "2.2.4", repo_name = "build_bazel_rules_swift", ) +bazel_dep( + name = "rules_apple", + version = "3.6.0", + repo_name = "build_bazel_rules_apple", +) bazel_dep( name = "bazel_skylib_gazelle_plugin", @@ -70,6 +75,7 @@ use_repo( "swiftpkg_cocoalumberjack", "swiftpkg_geoswift", "swiftpkg_libwebp_xcode", + "swiftpkg_ocmock", "swiftpkg_opencombine", "swiftpkg_swift_log", ) diff --git a/examples/interesting_deps/Package.resolved b/examples/interesting_deps/Package.resolved index 4e560e61a..d498e7767 100644 --- a/examples/interesting_deps/Package.resolved +++ b/examples/interesting_deps/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/GEOSwift/geos.git", "state" : { - "revision" : "f510e634c822116fca615064d889300dba40d761", - "version" : "8.1.0" + "revision" : "4d8af495e7507f48f1ae9104102debdd2043917b", + "version" : "9.0.0" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/GEOSwift/GEOSwift", "state" : { - "revision" : "2d23ede8c82c067655d3a9f0221bc73f08cd399a", - "version" : "10.1.0" + "revision" : "e42c062c2feb0df61373ae8cd6031a823a0dc981", + "version" : "11.0.0" } }, { @@ -36,6 +36,15 @@ "version" : "1.3.2" } }, + { + "identity" : "ocmock", + "kind" : "remoteSourceControl", + "location" : "https://github.com/erikdoe/ocmock", + "state" : { + "revision" : "2c0bfd373289f4a7716db5d6db471640f91a6507", + "version" : "3.9.4" + } + }, { "identity" : "opencombine", "kind" : "remoteSourceControl", @@ -50,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-log", "state" : { - "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5", - "version" : "1.5.4" + "revision" : "96a2f8a0fa41e9e09af4585e2724c4e825410b91", + "version" : "1.6.2" } } ], diff --git a/examples/interesting_deps/Package.swift b/examples/interesting_deps/Package.swift index 0dae0a77d..d1234a183 100644 --- a/examples/interesting_deps/Package.swift +++ b/examples/interesting_deps/Package.swift @@ -10,5 +10,6 @@ let package = Package( .package(url: "https://github.com/OpenCombine/OpenCombine", from: "0.14.0"), .package(url: "https://github.com/SDWebImage/libwebp-Xcode.git", from: "1.3.2"), .package(url: "https://github.com/apple/swift-log", from: "1.6.2"), + .package(url: "https://github.com/erikdoe/ocmock", from: "3.9.0"), ] ) diff --git a/examples/interesting_deps/do_test b/examples/interesting_deps/do_test index 903dbf5f4..4e14503d0 100755 --- a/examples/interesting_deps/do_test +++ b/examples/interesting_deps/do_test @@ -2,7 +2,7 @@ set -o errexit -o nounset -o pipefail -# Use the Bazel binary specified by the integration test. Otherise, fall back +# Use the Bazel binary specified by the integration test. Otherwise, fall back # to bazel. bazel="${BIT_BAZEL_BINARY:-bazel}" @@ -12,5 +12,7 @@ bazel="${BIT_BAZEL_BINARY:-bazel}" # Test resolving the package via the `swift_package` repo. "${bazel}" run @swift_package//:resolve -# Ensure that it builds and tests pass -"${bazel}" test //... +# Ensure that it builds in both sandbox and local strategies. +# This tests issues with modulemap include/generation. +"${bazel}" test //... --spawn_strategy=sandboxed,local +"${bazel}" test //... --spawn_strategy=local diff --git a/examples/interesting_deps/objc_test.m b/examples/interesting_deps/objc_test.m new file mode 100644 index 000000000..553005290 --- /dev/null +++ b/examples/interesting_deps/objc_test.m @@ -0,0 +1,16 @@ +#import + +@import Foundation; +@import XCTest; + +@interface ObjcTest : XCTestCase +@end + +@implementation ObjcTest + +- (void)testMock { + OCMockObject *mock = [OCMockObject mockForClass:[NSObject class]]; + XCTAssertNotNil(mock); +} + +@end diff --git a/swiftpkg/internal/swiftpkg_build_files.bzl b/swiftpkg/internal/swiftpkg_build_files.bzl index 3075f1889..d94ecc862 100644 --- a/swiftpkg/internal/swiftpkg_build_files.bzl +++ b/swiftpkg/internal/swiftpkg_build_files.bzl @@ -229,6 +229,7 @@ def _c_child_library( rule_kind, srcs, language_standard = None, + modulemap_path = None, res_copts = None): child_attrs = dicts.omit(attrs, ["data"]) child_copts = list(attrs.get("copts", [])) @@ -238,6 +239,8 @@ def _c_child_library( if language_standard: child_copts.append("-std={}".format(language_standard)) child_attrs["copts"] = child_copts + if modulemap_path: + child_attrs["module_map"] = modulemap_path return build_decls.new( rule_kind, name, @@ -434,8 +437,8 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target): modulemap_target_name = pkginfo_targets.modulemap_label_name(bzl_target_name) noop_modulemap = clang_src_info.modulemap_path != None modulemap_attrs = { - "deps": bzl_selects.to_starlark(modulemap_deps), - "hdrs": clang_src_info.hdrs, + "deps": [] if noop_modulemap else bzl_selects.to_starlark(modulemap_deps), + "hdrs": [] if noop_modulemap else clang_src_info.hdrs, "module_name": target.c99name, "noop": noop_modulemap, "visibility": ["//:__subpackages__"], @@ -448,6 +451,23 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target): ), ) + # Create an interop hint for any custom or generated modulemap. + # `module_map` attr of `objc_library` is being removed. + aspect_hint_target_name = pkginfo_targets.swift_hint_label_name( + bzl_target_name, + ) + load_stmts.append(swift_interop_hint_load_stmt) + decls.append( + build_decls.new( + kind = swift_kinds.interop_hint, + name = aspect_hint_target_name, + attrs = { + "module_map": clang_src_info.modulemap_path if clang_src_info.modulemap_path else modulemap_target_name, + "module_name": target.c99name, + }, + ), + ) + if clang_src_info.organized_srcs.objc_srcs: child_name = "{}_objc".format(bzl_target_name) child_dep_names.append(child_name) @@ -461,6 +481,7 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target): clang_src_info.organized_srcs.objc_srcs + clang_src_info.organized_srcs.other_srcs, language_standard = pkg_ctx.pkg_info.c_language_standard, + modulemap_path = clang_src_info.modulemap_path, res_copts = res_copts, ), ) @@ -477,18 +498,20 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target): clang_src_info.organized_srcs.objcxx_srcs + clang_src_info.organized_srcs.other_srcs, language_standard = pkg_ctx.pkg_info.cxx_language_standard, + modulemap_path = clang_src_info.modulemap_path, res_copts = res_copts, ), ) # Add the objc_library that brings all of the child targets together. uber_attrs = dicts.omit(attrs, ["srcs", "copts"]) | { + "aspect_hints": [aspect_hint_target_name], "deps": [ ":{}".format(dname) for dname in child_dep_names ], + "module_name": target.c99name, } - uber_attrs["module_name"] = target.c99name decls.append( build_decls.new( objc_kinds.library, @@ -502,6 +525,8 @@ def _clang_target_build_file(repository_ctx, pkg_ctx, target): bzl_target_name, ) aspect_hint_attrs = {"module_name": target.c99name} + if clang_src_info.modulemap_path: + aspect_hint_attrs["module_map"] = clang_src_info.modulemap_path load_stmts = [swift_interop_hint_load_stmt] decls.append( diff --git a/swiftpkg/tests/swiftpkg_build_files_tests.bzl b/swiftpkg/tests/swiftpkg_build_files_tests.bzl index 8a656e24b..53cbf878b 100644 --- a/swiftpkg/tests/swiftpkg_build_files_tests.bzl +++ b/swiftpkg/tests/swiftpkg_build_files_tests.bzl @@ -621,6 +621,7 @@ swift_interop_hint( msg = "Objc target", name = "ObjcLibrary", exp = """\ +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_interop_hint") load("@rules_swift_package_manager//swiftpkg:build_defs.bzl", "generate_modulemap") generate_modulemap( @@ -634,6 +635,7 @@ generate_modulemap( objc_library( name = "ObjcLibrary.rspm", + aspect_hints = ["ObjcLibrary.rspm_swift_hint"], deps = [":ObjcLibrary.rspm_objc"], enable_modules = True, hdrs = ["include/external.h"], @@ -698,18 +700,25 @@ objc_library( textual_hdrs = ["src/foo.m"], visibility = ["//:__subpackages__"], ) + +swift_interop_hint( + name = "ObjcLibrary.rspm_swift_hint", + module_map = "ObjcLibrary.rspm_modulemap", + module_name = "ObjcLibrary", +) """, ), struct( msg = "Objc target with a modulemap", name = "ObjcLibraryWithModulemap", exp = """\ +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_interop_hint") load("@rules_swift_package_manager//swiftpkg:build_defs.bzl", "generate_modulemap") generate_modulemap( name = "ObjcLibraryWithModulemap.rspm_modulemap", - deps = ["@swiftpkg_mypackage//:ObjcLibraryDep.rspm_modulemap"], - hdrs = ["include/external.h"], + deps = [], + hdrs = [], module_name = "ObjcLibraryWithModulemap", noop = True, visibility = ["//:__subpackages__"], @@ -717,6 +726,7 @@ generate_modulemap( objc_library( name = "ObjcLibraryWithModulemap.rspm", + aspect_hints = ["ObjcLibraryWithModulemap.rspm_swift_hint"], deps = [":ObjcLibraryWithModulemap.rspm_objc"], enable_modules = True, hdrs = ["include/external.h"], @@ -758,6 +768,7 @@ objc_library( enable_modules = True, hdrs = ["include/external.h"], includes = ["include"], + module_map = "include/module.modulemap", sdk_frameworks = select({ "@rules_swift_package_manager//config_settings/spm/platform:ios": [ "Foundation", @@ -781,6 +792,12 @@ objc_library( textual_hdrs = ["src/foo.m"], visibility = ["//:__subpackages__"], ) + +swift_interop_hint( + name = "ObjcLibraryWithModulemap.rspm_swift_hint", + module_map = "include/module.modulemap", + module_name = "ObjcLibraryWithModulemap", +) """, ), struct( @@ -931,6 +948,7 @@ swift_library( name = "ObjcLibraryWithResources", exp = """\ load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle") +load("@build_bazel_rules_swift//swift:swift.bzl", "swift_interop_hint") load("@rules_swift_package_manager//swiftpkg:build_defs.bzl", "generate_modulemap", "objc_resource_bundle_accessor_hdr", "objc_resource_bundle_accessor_impl", "resource_bundle_infoplist") apple_resource_bundle( @@ -952,6 +970,7 @@ generate_modulemap( objc_library( name = "ObjcLibraryWithResources.rspm", + aspect_hints = ["ObjcLibraryWithResources.rspm_swift_hint"], data = [":ObjcLibraryWithResources.rspm_resource_bundle"], deps = [":ObjcLibraryWithResources.rspm_objc"], enable_modules = True, @@ -1039,6 +1058,12 @@ resource_bundle_infoplist( name = "ObjcLibraryWithResources.rspm_resource_bundle_infoplist", region = "en", ) + +swift_interop_hint( + name = "ObjcLibraryWithResources.rspm_swift_hint", + module_map = "ObjcLibraryWithResources.rspm_modulemap", + module_name = "ObjcLibraryWithResources", +) """, ), ] From 27437ce8bc160d9e37c9d3b2a8b7df454833c4f4 Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Mon, 2 Dec 2024 10:38:08 -0700 Subject: [PATCH 58/58] chore: update Bazel version in presubmit.yml (#1367) Sync Bazel version. --- .bcr/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index fc4a2aa7d..2796ee5f6 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -4,7 +4,7 @@ bcr_test_module: platform: ["macos"] bazel: # This needs to exactly match the value used in .bazelversion at the root. - - 7.4.0 + - 7.4.1 tasks: run_tests: name: "Run test module"