Skip to content

Commit a679464

Browse files
author
Napas (Tian) Udomsak
authored
Add fetch_source parameter to scala_repositories (#1027)
* add fetch sources to scala_repositories * adding fetch_sources to WORKSPACE
1 parent 634ea5a commit a679464

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildifier_dependencies()
1717

1818
load("//scala:scala.bzl", "scala_repositories")
1919

20-
scala_repositories()
20+
scala_repositories(fetch_sources = True)
2121

2222
load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
2323
load("//scala:scala_maven_import_external.bzl", "scala_maven_import_external")

scala/private/macros/scala_repositories.bzl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,16 @@ def scala_repositories(
5858
_default_scala_version_jar_shas(),
5959
),
6060
maven_servers = _default_maven_server_urls(),
61-
scala_extra_jars = _default_scala_extra_jars()):
61+
scala_extra_jars = _default_scala_extra_jars(),
62+
fetch_sources = False):
6263
(scala_version, scala_version_jar_shas) = scala_version_shas
6364
major_version = _extract_major_version(scala_version)
6465

6566
_new_scala_default_repository(
6667
maven_servers = maven_servers,
6768
scala_version = scala_version,
6869
scala_version_jar_shas = scala_version_jar_shas,
70+
fetch_sources = fetch_sources,
6971
)
7072

7173
scala_version_extra_jars = scala_extra_jars[major_version]
@@ -79,6 +81,7 @@ def scala_repositories(
7981
artifact_sha256 = scala_version_extra_jars["scalatest"]["sha256"],
8082
licenses = ["notice"],
8183
server_urls = maven_servers,
84+
fetch_sources = fetch_sources,
8285
)
8386
_scala_maven_import_external(
8487
name = "io_bazel_rules_scala_scalactic",
@@ -89,6 +92,7 @@ def scala_repositories(
8992
artifact_sha256 = scala_version_extra_jars["scalactic"]["sha256"],
9093
licenses = ["notice"],
9194
server_urls = maven_servers,
95+
fetch_sources = fetch_sources,
9296
)
9397

9498
_scala_maven_import_external(
@@ -100,6 +104,7 @@ def scala_repositories(
100104
artifact_sha256 = scala_version_extra_jars["scala_xml"]["sha256"],
101105
licenses = ["notice"],
102106
server_urls = maven_servers,
107+
fetch_sources = fetch_sources,
103108
)
104109

105110
_scala_maven_import_external(
@@ -112,6 +117,7 @@ def scala_repositories(
112117
artifact_sha256 = scala_version_extra_jars["scala_parser_combinators"]["sha256"],
113118
licenses = ["notice"],
114119
server_urls = maven_servers,
120+
fetch_sources = fetch_sources,
115121
)
116122

117123
# used by ScalacProcessor
@@ -121,6 +127,7 @@ def scala_repositories(
121127
artifact_sha256 = "f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513",
122128
licenses = ["notice"],
123129
server_urls = maven_servers,
130+
fetch_sources = fetch_sources,
124131
)
125132

126133
_scala_maven_import_external(
@@ -129,6 +136,7 @@ def scala_repositories(
129136
artifact_sha256 = "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480",
130137
licenses = ["notice"],
131138
server_urls = maven_servers,
139+
fetch_sources = fetch_sources,
132140
)
133141

134142
if not native.existing_rule("com_google_protobuf"):

scala/scala_cross_version.bzl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,29 @@ def scala_mvn_artifact(
6464
def new_scala_default_repository(
6565
scala_version,
6666
scala_version_jar_shas,
67-
maven_servers):
67+
maven_servers,
68+
fetch_sources):
6869
_scala_maven_import_external(
6970
name = "io_bazel_rules_scala_scala_library",
7071
artifact = "org.scala-lang:scala-library:{}".format(scala_version),
7172
artifact_sha256 = scala_version_jar_shas["scala_library"],
7273
licenses = ["notice"],
7374
server_urls = maven_servers,
75+
fetch_sources = fetch_sources,
7476
)
7577
_scala_maven_import_external(
7678
name = "io_bazel_rules_scala_scala_compiler",
7779
artifact = "org.scala-lang:scala-compiler:{}".format(scala_version),
7880
artifact_sha256 = scala_version_jar_shas["scala_compiler"],
7981
licenses = ["notice"],
8082
server_urls = maven_servers,
83+
fetch_sources = fetch_sources,
8184
)
8285
_scala_maven_import_external(
8386
name = "io_bazel_rules_scala_scala_reflect",
8487
artifact = "org.scala-lang:scala-reflect:{}".format(scala_version),
8588
artifact_sha256 = scala_version_jar_shas["scala_reflect"],
8689
licenses = ["notice"],
8790
server_urls = maven_servers,
91+
fetch_sources = fetch_sources,
8892
)

test_version/WORKSPACE.template

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ scala_version = "${scala_version}"
1111

1212
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
1313

14-
scala_repositories((scala_version, {
15-
${scala_version_shas}
16-
}))
14+
scala_repositories(
15+
(scala_version, {
16+
${scala_version_shas}
17+
}),
18+
fetch_sources = True
19+
)
1720

1821
load("@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge", "scrooge_scala_library")
1922

0 commit comments

Comments
 (0)