Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 rules/scala.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ _compile_attributes = {
"-src.jar",
],
flags = ["DIRECT_COMPILE_TIME_INPUT"],
mandatory = True,

Choose a reason for hiding this comment

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

Any specific reason for this change?

Copy link
Author

Choose a reason for hiding this comment

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

),
"data": attr.label_list(
cfg = _scala_outgoing_transition,
Expand Down
2 changes: 2 additions & 0 deletions src/main/scala/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ register_zinc_toolchain(
# IntelliJ libraries, so we can get a Scala SDK on sync.
scala_library(
name = "scala-sdk",
srcs = [],
deps_used_whitelist = compiler_classpath_2_13,
scala_toolchain_name = "annex_zinc_3",
deps = compiler_classpath_2_13,
Expand All @@ -69,6 +70,7 @@ runtime_classpath_3 = [

scala_library(
name = "scala-sdk-3",
srcs = [],
deps_used_whitelist = compiler_classpath_3,
scala_toolchain_name = "annex_zinc_3",
deps = compiler_classpath_3,
Expand Down
1 change: 1 addition & 0 deletions tests/binary/resource/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ scala_library(

scala_binary(
name = "bin",
srcs = [],
main_class = "Example",
resource_strip_prefix = package_name(),
resources = ["example.txt"],
Expand Down
1 change: 1 addition & 0 deletions tests/dependencies/validation_action/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "validation_action",
srcs = [],
scala_toolchain_name = "test_zinc_2_13",
tags = ["manual"],
)
1 change: 1 addition & 0 deletions tests/plugins/semanticdb/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ read_semanticdb_info(

scala_library(
name = "semanticdb-empty",
srcs = [],
scala_toolchain_name = "scala_2_13_with_semanticdb",
)

Expand Down
1 change: 1 addition & 0 deletions tests/resources/maven/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "maven",
srcs = [],
resources = glob(["src/main/resources/*"]),
scala_toolchain_name = "test_zinc_2_13",
)
2 changes: 2 additions & 0 deletions tests/resources/plain/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "plain",
srcs = [],
resources = glob(["**/*.txt"]),
scala_toolchain_name = "test_zinc_2_13",
)

scala_library(
name = "merged",
srcs = [],
resource_jars = [":plain"],
resource_strip_prefix = "resources",
resources = glob(["**/*.txt"]),
Expand Down
2 changes: 2 additions & 0 deletions tests/resources/prefix/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "prefix",
srcs = [],
resource_strip_prefix = package_name(),
resources = glob(["**/*.txt"]),
scala_toolchain_name = "test_zinc_2_13",
)

scala_library(
name = "outside",
srcs = [],
resource_strip_prefix = "{}/other".format(package_name()),
resources = glob(["**/*.txt"]),
scala_toolchain_name = "test_zinc_2_13",
Expand Down
1 change: 1 addition & 0 deletions tests/resources/reference_conf/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "plain",
srcs = [],
resource_strip_prefix = "resources/reference_conf",
resources = ["reference.conf"],
scala_toolchain_name = "test_zinc_2_13",
Expand Down
1 change: 1 addition & 0 deletions tests/resources/special_characters/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_library")

scala_library(
name = "special_characters",
srcs = [],
resources = glob(["**/*.txt"]),
scala_toolchain_name = "test_zinc_2_13",
)