Skip to content

Commit fabd2fc

Browse files
Merge branch 'main' into karim/remove-duplicated-srcs-from-list
2 parents 80ec224 + d23f70d commit fabd2fc

File tree

46 files changed

+625
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+625
-502
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.1
1+
7.5.0

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bazel_dep(
3434
)
3535
bazel_dep(
3636
name = "gazelle",
37-
version = "0.41.0",
37+
version = "0.42.0",
3838
repo_name = "bazel_gazelle",
3939
)
4040

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Add a dependency on `rules_swift_package_manager`.
8989

9090
<!-- BEGIN MODULE SNIPPET -->
9191
```python
92-
bazel_dep(name = "rules_swift_package_manager", version = "0.43.0")
92+
bazel_dep(name = "rules_swift_package_manager", version = "0.45.0")
9393
```
9494
<!-- END MODULE SNIPPET -->
9595

bzlmod/workspace/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1515
bazel_dep(name = "apple_support", version = "1.17.1")
1616
bazel_dep(
1717
name = "rules_swift",
18-
version = "2.3.1",
18+
version = "2.4.0",
1919
repo_name = "build_bazel_rules_swift",
2020
)
2121

@@ -26,7 +26,7 @@ bazel_dep(
2626
)
2727
bazel_dep(
2828
name = "gazelle",
29-
version = "0.41.0",
29+
version = "0.42.0",
3030
dev_dependency = True,
3131
repo_name = "bazel_gazelle",
3232
)

docs/bzlmod_extensions_overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ On this page:
1616
<pre>
1717
swift_deps = use_extension("@rules_swift_package_manager//:extensions.bzl", "swift_deps")
1818
swift_deps.configure_package(<a href="#swift_deps.configure_package-name">name</a>, <a href="#swift_deps.configure_package-init_submodules">init_submodules</a>, <a href="#swift_deps.configure_package-patch_args">patch_args</a>, <a href="#swift_deps.configure_package-patch_cmds">patch_cmds</a>, <a href="#swift_deps.configure_package-patch_cmds_win">patch_cmds_win</a>,
19-
<a href="#swift_deps.configure_package-patch_tool">patch_tool</a>, <a href="#swift_deps.configure_package-patches">patches</a>, <a href="#swift_deps.configure_package-recursive_init_submodules">recursive_init_submodules</a>)
19+
<a href="#swift_deps.configure_package-patch_tool">patch_tool</a>, <a href="#swift_deps.configure_package-patches">patches</a>, <a href="#swift_deps.configure_package-publicly_expose_all_targets">publicly_expose_all_targets</a>,
20+
<a href="#swift_deps.configure_package-recursive_init_submodules">recursive_init_submodules</a>)
2021
swift_deps.configure_swift_package(<a href="#swift_deps.configure_swift_package-build_path">build_path</a>, <a href="#swift_deps.configure_swift_package-cache_path">cache_path</a>, <a href="#swift_deps.configure_swift_package-dependency_caching">dependency_caching</a>, <a href="#swift_deps.configure_swift_package-manifest_cache">manifest_cache</a>,
2122
<a href="#swift_deps.configure_swift_package-manifest_caching">manifest_caching</a>, <a href="#swift_deps.configure_swift_package-security_path">security_path</a>)
2223
swift_deps.from_package(<a href="#swift_deps.from_package-declare_swift_deps_info">declare_swift_deps_info</a>, <a href="#swift_deps.from_package-declare_swift_package">declare_swift_package</a>, <a href="#swift_deps.from_package-resolved">resolved</a>, <a href="#swift_deps.from_package-swift">swift</a>)
@@ -42,6 +43,7 @@ Used to add or override settings for a particular Swift package.
4243
| <a id="swift_deps.configure_package-patch_cmds_win"></a>patch_cmds_win | Sequence of Powershell commands to be applied on Windows after patches are applied. If this attribute is not set, patch_cmds will be executed on Windows, which requires Bash binary to exist. | List of strings | optional | `[]` |
4344
| <a id="swift_deps.configure_package-patch_tool"></a>patch_tool | The patch(1) utility to use. If this is specified, Bazel will use the specified patch tool instead of the Bazel-native patch implementation. | String | optional | `""` |
4445
| <a id="swift_deps.configure_package-patches"></a>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. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | `[]` |
46+
| <a id="swift_deps.configure_package-publicly_expose_all_targets"></a>publicly_expose_all_targets | Allows to expose internal build targets required for package compilation. The structure and labels of exposed targets may change in future releases without requiring a major version bump. | Boolean | optional | `False` |
4547
| <a id="swift_deps.configure_package-recursive_init_submodules"></a>recursive_init_submodules | Whether to clone submodules recursively in the repository. | Boolean | optional | `True` |
4648

4749
<a id="swift_deps.configure_swift_package"></a>

docs/repository_rules_overview.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ Used to build a local Swift package.
4141

4242
<pre>
4343
swift_package(<a href="#swift_package-name">name</a>, <a href="#swift_package-bazel_package_name">bazel_package_name</a>, <a href="#swift_package-branch">branch</a>, <a href="#swift_package-commit">commit</a>, <a href="#swift_package-dependencies_index">dependencies_index</a>, <a href="#swift_package-env">env</a>, <a href="#swift_package-init_submodules">init_submodules</a>,
44-
<a href="#swift_package-patch_args">patch_args</a>, <a href="#swift_package-patch_cmds">patch_cmds</a>, <a href="#swift_package-patch_cmds_win">patch_cmds_win</a>, <a href="#swift_package-patch_tool">patch_tool</a>, <a href="#swift_package-patches">patches</a>, <a href="#swift_package-recursive_init_submodules">recursive_init_submodules</a>,
45-
<a href="#swift_package-remote">remote</a>, <a href="#swift_package-repo_mapping">repo_mapping</a>, <a href="#swift_package-shallow_since">shallow_since</a>, <a href="#swift_package-tag">tag</a>, <a href="#swift_package-verbose">verbose</a>, <a href="#swift_package-version">version</a>)
44+
<a href="#swift_package-patch_args">patch_args</a>, <a href="#swift_package-patch_cmds">patch_cmds</a>, <a href="#swift_package-patch_cmds_win">patch_cmds_win</a>, <a href="#swift_package-patch_tool">patch_tool</a>, <a href="#swift_package-patches">patches</a>,
45+
<a href="#swift_package-publicly_expose_all_targets">publicly_expose_all_targets</a>, <a href="#swift_package-recursive_init_submodules">recursive_init_submodules</a>, <a href="#swift_package-remote">remote</a>, <a href="#swift_package-repo_mapping">repo_mapping</a>,
46+
<a href="#swift_package-shallow_since">shallow_since</a>, <a href="#swift_package-tag">tag</a>, <a href="#swift_package-verbose">verbose</a>, <a href="#swift_package-version">version</a>)
4647
</pre>
4748

4849
Used to download and build an external Swift package.
@@ -64,6 +65,7 @@ Used to download and build an external Swift package.
6465
| <a id="swift_package-patch_cmds_win"></a>patch_cmds_win | Sequence of Powershell commands to be applied on Windows after patches are applied. If this attribute is not set, patch_cmds will be executed on Windows, which requires Bash binary to exist. | List of strings | optional | `[]` |
6566
| <a id="swift_package-patch_tool"></a>patch_tool | The patch(1) utility to use. If this is specified, Bazel will use the specified patch tool instead of the Bazel-native patch implementation. | String | optional | `""` |
6667
| <a id="swift_package-patches"></a>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. | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | `[]` |
68+
| <a id="swift_package-publicly_expose_all_targets"></a>publicly_expose_all_targets | Allows to expose internal build targets required for package compilation. The structure and labels of exposed targets may change in future releases without requiring a major version bump. | Boolean | optional | `False` |
6769
| <a id="swift_package-recursive_init_submodules"></a>recursive_init_submodules | Whether to clone submodules recursively in the repository. | Boolean | optional | `True` |
6870
| <a id="swift_package-remote"></a>remote | The version control location from where the repository should be downloaded. | String | required | |
6971
| <a id="swift_package-repo_mapping"></a>repo_mapping | In `WORKSPACE` context only: a dictionary from local repository name to global repository name. This allows controls over workspace dependency resolution for dependencies of this repository.<br><br>For example, an entry `"@foo": "@bar"` declares that, for any time this repository depends on `@foo` (such as a dependency on `@foo//some:target`, it should actually resolve that dependency within globally-declared `@bar` (`@bar//some:target`).<br><br>This attribute is _not_ supported in `MODULE.bazel` context (when invoking a repository rule inside a module extension's implementation function). | <a href="https://bazel.build/rules/lib/dict">Dictionary: String -> String</a> | optional | |

examples/firebase_example/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1515
bazel_dep(name = "apple_support", version = "1.17.1")
1616
bazel_dep(
1717
name = "rules_swift",
18-
version = "2.3.1",
18+
version = "2.4.0",
1919
repo_name = "build_bazel_rules_swift",
2020
)
2121
bazel_dep(
@@ -36,7 +36,7 @@ bazel_dep(
3636
)
3737
bazel_dep(
3838
name = "gazelle",
39-
version = "0.41.0",
39+
version = "0.42.0",
4040
dev_dependency = True,
4141
repo_name = "bazel_gazelle",
4242
)

examples/firebase_example/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "firebase_example",
77
dependencies: [
8-
.package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: "11.6.0")),
8+
.package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: "11.8.1")),
99
// Used by crashlytics example
1010
.package(url: "https://github.com/ashleymills/Reachability.swift.git", .upToNextMajor(from: "5.2.4")),
1111
]

examples/google_maps_example/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212
bazel_dep(name = "apple_support", version = "1.17.1")
1313
bazel_dep(
1414
name = "rules_swift",
15-
version = "2.3.1",
15+
version = "2.4.0",
1616
repo_name = "build_bazel_rules_swift",
1717
)
1818
bazel_dep(
@@ -28,7 +28,7 @@ bazel_dep(
2828
)
2929
bazel_dep(
3030
name = "gazelle",
31-
version = "0.41.0",
31+
version = "0.42.0",
3232
dev_dependency = True,
3333
repo_name = "bazel_gazelle",
3434
)

examples/google_maps_example/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import PackageDescription
55
let package = Package(
66
name: "google_maps_example",
77
dependencies: [
8-
.package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.2.0"),
8+
.package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.3.0"),
99
]
1010
)

0 commit comments

Comments
 (0)