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

Allow resources to be in a kotlin directory #268

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Allow resources to be in a kotlin directory #268

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
3ad8c51
Allow resources to be in a kotlin directory
rockwotj Feb 1, 2020
1fb06bb
Update docs
rockwotj Feb 6, 2020
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
1 change: 1 addition & 0 deletions kotlin/internal/jvm/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def _fold_jars_action(ctx, rule_kind, output_jar, input_jars):
_CONVENTIONAL_RESOURCE_PATHS = [
"src/main/resources",
"src/test/resources",
"kotlin",
]

def _adjust_resources_path_by_strip_prefix(path, resource_strip_prefix):
Expand Down
2 changes: 1 addition & 1 deletion kotlin/internal/jvm/jvm.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ _common_attr = utils.add_dicts(
),
"resource_strip_prefix": attr.string(
doc = """The path prefix to strip from Java resources, files residing under common prefix such as
`src/main/resources` or `src/test/resources` will have stripping applied by convention.""",
`src/main/resources` or `src/test/resources` or `kotlin` will have stripping applied by convention.""",
default = "",
),
"resource_jars": attr.label_list(
Expand Down