diff options
| author | nickreid <nickreid@google.com> | 2023-10-05 19:21:26 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-10-05 19:22:01 -0700 |
| commit | 98692d1c0681c6d531ac0514cb6e4c409c8a1a29 (patch) | |
| tree | aa140867c2113a2033571d8e7c724f91c08a8f52 | |
| parent | 4cdf417e30fe5e2114e8001f3db15663765414ee (diff) | |
| download | bazelbuild-kotlin-rules-98692d1c0681c6d531ac0514cb6e4c409c8a1a29.tar.gz | |
n/a
PiperOrigin-RevId: 571198412
Change-Id: I0da9ab2892c89dff8713201e9b656cbf45fe73ba
| -rw-r--r-- | bazel/stubs.bzl | 7 | ||||
| -rw-r--r-- | kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/bazel/stubs.bzl b/bazel/stubs.bzl index 4a6915d..33e6d9e 100644 --- a/bazel/stubs.bzl +++ b/bazel/stubs.bzl @@ -15,16 +15,15 @@ """Stubs""" load("//:visibility.bzl", "RULES_KOTLIN") -load("@bazel_skylib//lib:sets.bzl", "sets") def _empty_fn(*_args, **_kwargs): pass register_extension_info = _empty_fn -FORBIDDEN_DEP_PACKAGES = sets.make([]) +is_forbidden_dep = _empty_fn -EXEMPT_DEPS = sets.make([]) +is_exempt_dep = _empty_fn DEFAULT_BUILTIN_PROCESSORS = [ "com.google.android.apps.play.store.plugins.injectionentrypoint.InjectionEntryPointProcessor", @@ -58,7 +57,7 @@ lint_actions = struct( def check_compiler_opt_allowlist(_label): pass -def jspecify_flags(ctx): +def jspecify_flags(_ctx): # Trust JSpecify nullness annotations # (see https://kotlinlang.org/docs/whatsnew1520.html#support-for-jspecify-nullness-annotations) return ["-Xjspecify-annotations=strict"] diff --git a/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl b/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl index fa1db86..cda9cf8 100644 --- a/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl +++ b/kotlin/jvm/internal_do_not_use/traverse_exports/forbidden_deps.bzl @@ -20,21 +20,17 @@ Currently this system recognizes: - targets exporting other forbidden targets """ -load("@bazel_skylib//lib:sets.bzl", "sets") -load("//bazel:stubs.bzl", "EXEMPT_DEPS", "FORBIDDEN_DEP_PACKAGES") load("//:visibility.bzl", "RULES_KOTLIN") +load("//bazel:stubs.bzl", "is_exempt_dep", "is_forbidden_dep") def _error(target, msg): return (str(target.label), msg) -def _is_exempt(target): - return sets.contains(EXEMPT_DEPS, str(target.label)) - def _check_forbidden(target, ctx_rule): - if _is_exempt(target): + if is_exempt_dep(target): return [] - if sets.contains(FORBIDDEN_DEP_PACKAGES, target.label.package): + if is_forbidden_dep(target): return [_error(target, "Forbidden package")] # Identify nano protos using tag (b/122083175) @@ -45,7 +41,7 @@ def _check_forbidden(target, ctx_rule): return [] def _if_not_checked(target): - return [] if _is_exempt(target) else [_error(target, "Not checked")] + return [] if is_exempt_dep(target) else [_error(target, "Not checked")] def _validate_deps(error_set): if not error_set: |