Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix marking of development dependencies #782

Merged
merged 1 commit into from
Oct 17, 2023
+12 −10
Merged

Fix marking of development dependencies #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ bazel_dep(
non_module_deps = use_extension("//rules:module_extensions.bzl", "non_module_deps")
use_repo(
non_module_deps,
"arm64-to-sim",
"com_github_yonaskolb_xcodegen",
"tart",
)

non_module_dev_deps = use_extension(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could add a comment here:

Note: these are the deps used in rules_ios testing infra and examples and not for consumers

Expand All @@ -70,9 +72,7 @@ use_repo(
non_module_dev_deps,
"GoogleMobileAdsSDK",
"TensorFlowLiteC",
"arm64-to-sim",
"com_github_apple_swiftcollections",
"tart",
)

# Configure Xcode
Expand Down
18 changes: 10 additions & 8 deletions rules/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ def rules_ios_dependencies(
if load_bzlmod_dependencies:
_rules_ios_bzlmod_dependencies()

# Non-bzlmod tool dependencies that are used in the rule APIs
_rules_ios_tool_dependencies()

# If legacy project generator is deprecated this can be removed.
_rules_ios_legacy_xcodeproj_dependencies()

Expand All @@ -84,7 +87,6 @@ def rules_ios_dev_dependencies(
if load_bzlmod_dependencies:
_rules_ios_bzlmod_dev_dependencies()

_rules_ios_tool_dependencies()
_rules_ios_test_dependencies()

def _rules_ios_bzlmod_dependencies():
Expand Down Expand Up @@ -141,13 +143,6 @@ def _rules_ios_bzlmod_dependencies():
],
)

def _rules_ios_bzlmod_dev_dependencies():
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The git diff here seems wrong, the real change was moving rules_pkg from _rules_ios_bzlmod_dev_dependencies to _rules_ios_bzlmod_dependencies

"""
Fetches repositories that are development dependencies of `rules_ios` and available via bzlmod.

These are only included when using WORKSPACE, when using bzlmod they're loaded in MODULE.bazel
"""

_maybe(
http_archive,
name = "rules_pkg",
Expand All @@ -158,6 +153,13 @@ def _rules_ios_bzlmod_dev_dependencies():
sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
)

def _rules_ios_bzlmod_dev_dependencies():
"""
Fetches repositories that are development dependencies of `rules_ios` and available via bzlmod.

These are only included when using WORKSPACE, when using bzlmod they're loaded in MODULE.bazel
"""

_maybe(
http_archive,
name = "buildifier_prebuilt",
Expand Down