Skip to content

Commit 8745399

Browse files
committed
Merge pull request #15 from bazelbuild/johnynek/add_scala_version_fn
Add scala_version function
2 parents 1acc8ed + d5c7f78 commit 8745399

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

WORKSPACE

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
workspace(name = "io_bazel_rules_scala")
22

3-
load("//scala:scala.bzl", "scala_repositories")
3+
load("//scala:scala.bzl", "scala_repositories", "scala_mvn_artifact")
44
scala_repositories()
5+
6+
# test adding a scala jar:
7+
maven_jar(
8+
name = "com_twitter__scalding_date",
9+
artifact = scala_mvn_artifact("com.twitter:scalding-date:0.16.0-RC4")
10+
)

scala/scala.bzl

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,17 @@ scala_test = rule(
327327
test=True,
328328
)
329329

330+
def scala_version():
331+
"""return the scala version for use in maven coordinates"""
332+
return "2.11"
333+
334+
def scala_mvn_artifact(artifact):
335+
gav = artifact.split(":")
336+
groupid = gav[0]
337+
artifactid = gav[1]
338+
version = gav[2]
339+
return "%s:%s_%s:%s" % (groupid, artifactid, scala_version(), version)
340+
330341
SCALA_BUILD_FILE = """
331342
# scala.BUILD
332343
exports_files([
@@ -342,7 +353,7 @@ exports_files([
342353
"lib/scala-continuations-library_2.11-1.0.2.jar",
343354
"lib/scala-continuations-plugin_2.11.7-1.0.2.jar",
344355
"lib/scala-library.jar",
345-
"lib/scala-parser-comscala-2.11.7/binators_2.11-1.0.4.jar",
356+
"lib/scala-parser-combinators_2.11-1.0.4.jar",
346357
"lib/scala-reflect.jar",
347358
"lib/scala-swing_2.11-1.0.2.jar",
348359
"lib/scala-xml_2.11-1.0.4.jar",

test/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,8 @@ scala_binary(
8888
main_class = "scala.test.ScalaLibBinary",
8989
deps = ["ScalaLibResources"],
9090
)
91+
92+
scala_library(
93+
name = "jar_export",
94+
exports = ["@com_twitter__scalding_date//jar"]
95+
)

0 commit comments

Comments
 (0)