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

Be compatible to stop exporting language modules #167

Merged
merged 2 commits into from
Dec 22, 2023
Merged

Be compatible to stop exporting language modules #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e2b60c
Be compatible to incompatible_stop_exporting_language_modules
martis42 Dec 21, 2023
5bcdac8
More canonical name for testing script
martis42 Dec 22, 2023
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
10 changes: 5 additions & 5 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ bazel_dep(
# Keep in sync with //third_party/dependencies.bzl
version = "1.5.0",
)
bazel_dep(
name = "rules_cc",
# Keep in sync with //third_party/dependencies.bzl
version = "0.0.9",
)
bazel_dep(
name = "rules_python",
# Keep in sync with //third_party/dependencies.bzl
Expand Down Expand Up @@ -110,8 +115,3 @@ bazel_dep(
version = "0.0.7",
dev_dependency = True,
)
bazel_dep(
name = "rules_cc",
version = "0.0.1",
dev_dependency = True,
)
1 change: 1 addition & 0 deletions src/aspect/dwyu.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "CPP_COMPILE_ACTION_NAME")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
load("@depend_on_what_you_use//src/cc_info_mapping:cc_info_mapping.bzl", "DwyuCcInfoRemappingsInfo")
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_common")

def _get_target_sources(rule):
public_files = []
Expand Down
1 change: 1 addition & 0 deletions src/cc_info_mapping/private/direct_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_common")
load(":providers.bzl", "DwyuCcInfoRemapInfo")

def _aggregate_direct_deps_aspect_impl(target, ctx):
Expand Down
1 change: 1 addition & 0 deletions src/cc_info_mapping/private/explicit.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_common")
load(":providers.bzl", "DwyuCcInfoRemapInfo")

def _explicit_mapping_impl(ctx):
Expand Down
1 change: 1 addition & 0 deletions src/cc_info_mapping/private/transitive_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_common")
load(":providers.bzl", "DwyuCcInfoRemapInfo")

def _aggregate_transitive_deps_aspect_impl(target, ctx):
Expand Down
4 changes: 2 additions & 2 deletions test/aspect/execute_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"--incompatible_check_visibility_for_toolchains": CompatibleVersions(min="7.0.0"),
"--incompatible_auto_exec_groups": CompatibleVersions(min="7.0.0"),
"--incompatible_disable_non_executable_java_binary": CompatibleVersions(min="7.0.0"),
# TODO for us to work on those:
# "--incompatible_stop_exporting_language_modules": CompatibleVersions(min="5.0.0"),
# Theoretically of interest for us, but rules_python does not comply to this.
# "--incompatible_stop_exporting_language_modules": CompatibleVersions(min="6.0.0"),
# Theoretically interesting for our project, but Bazel itself does not adhere to it
# "--incompatible_python_disallow_native_rules": CompatibleVersions(min="7.0.0"),
# Theoretically of interest for us, but rules_python does not comply to this.
Expand Down
0 all_tests.sh → tests.sh
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions third_party/dependencies.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ def dependencies():
urls = ["https://github.com/bazelbuild/rules_python/releases/download/{v}/rules_python-{v}.tar.gz".format(v = rules_python_version)],
)

# Keep in sync with MODULE.bazel
rules_cc_version = "0.0.9"
maybe(
http_archive,
name = "rules_cc",
sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
strip_prefix = "rules_cc-{}".format(rules_cc_version),
urls = ["https://github.com/bazelbuild/rules_cc/releases/download/{v}/rules_cc-{v}.tar.gz".format(v = rules_cc_version)],
)

# Keep in sync with MODULE.bazel
skylib_version = "1.5.0"
http_archive(
Expand Down