Skip to content

Commit 30eb9c8

Browse files
committed
Rename
1 parent 969f6c5 commit 30eb9c8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

private/rules/coursier.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ def make_coursier_dep_tree(
794794
fetch_sources,
795795
fetch_javadoc,
796796
timeout,
797-
additional_options,
797+
additional_coursier_options,
798798
report_progress_prefix = ""):
799799
# Set up artifact exclusion, if any. From coursier fetch --help:
800800
#
@@ -882,7 +882,7 @@ def make_coursier_dep_tree(
882882
# https://github.com/coursier/coursier/blob/1cbbf39b88ee88944a8d892789680cdb15be4714/modules/paths/src/main/java/coursier/paths/CoursierPaths.java#L29-L56
883883
environment = {"COURSIER_CACHE": str(repository_ctx.path(coursier_cache_location))}
884884

885-
cmd.extend(additional_options)
885+
cmd.extend(additional_coursier_options)
886886

887887
# Use an argsfile to avoid command line length limits, requires Java version > 8
888888
java_cmd = cmd[0]
@@ -990,7 +990,7 @@ def _coursier_fetch_impl(repository_ctx):
990990
repository_ctx.attr.fetch_sources,
991991
repository_ctx.attr.fetch_javadoc,
992992
repository_ctx.attr.resolve_timeout,
993-
repository_ctx.attr.additional_options,
993+
repository_ctx.attr.additional_coursier_options,
994994
)
995995

996996
files_to_inspect = []
@@ -1432,7 +1432,7 @@ coursier_fetch = repository_rule(
14321432
],
14331433
),
14341434
"ignore_empty_files": attr.bool(default = False, doc = "Treat jars that are empty as if they were not found."),
1435-
"additional_options": attr.string_list(doc = "Additional options that will be passed to coursier."),
1435+
"additional_coursier_options": attr.string_list(doc = "Additional options that will be passed to coursier."),
14361436
},
14371437
environ = [
14381438
"JAVA_HOME",

private/rules/maven_install.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def maven_install(
2828
duplicate_version_warning = "warn",
2929
repin_instructions = None,
3030
ignore_empty_files = False,
31-
resolver_additional_options = []):
31+
additional_coursier_options = []):
3232
"""Resolves and fetches artifacts transitively from Maven repositories.
3333
3434
This macro runs a repository rule that invokes the Coursier CLI to resolve
@@ -79,7 +79,7 @@ def maven_install(
7979
is "warn".
8080
repin_instructions: Instructions to re-pin dependencies in your repository. Will be shown when re-pinning is required.
8181
ignore_empty_files: Treat jars that are empty as if they were not found.
82-
resolver_additional_options: Additional options that will be passed to the resolver. Only supports `coursier` resolver for now.
82+
additional_coursier_options: Additional options that will be passed to coursier.
8383
"""
8484
if boms and resolver == "coursier":
8585
fail("The coursier resolver does not support resolving Maven BOMs. Please use another resolver.")
@@ -141,7 +141,7 @@ def maven_install(
141141
aar_import_bzl_label = aar_import_bzl_label,
142142
duplicate_version_warning = duplicate_version_warning,
143143
ignore_empty_files = ignore_empty_files,
144-
additional_options = resolver_additional_options,
144+
additional_coursier_options = additional_coursier_options,
145145
)
146146

147147
else:

0 commit comments

Comments
 (0)