Skip to content

Commit 3a96838

Browse files
committed
Upgrade to Scala 2.12.4
Remove the YdisableFlatCpCaching workaround. The bug has been fixed in Scala 2.12. Fixes bazel-contrib#305
1 parent 804063f commit 3a96838

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

scala/scala.bzl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,7 @@ DependencyAnalyzerMode: {dependency_analyzer_mode}
206206
""".format(
207207
out=ctx.outputs.jar.path,
208208
manifest=ctx.outputs.manifest.path,
209-
# always append -YdisableFlatCpCaching, workaround for
210-
# https://github.com/bazelbuild/rules_scala/issues/305
211-
# remove once we upgrade to Scala 2.12.4
212-
scala_opts=",".join(ctx.attr.scalacopts + ["-YdisableFlatCpCaching"]),
209+
scala_opts=",".join(ctx.attr.scalacopts),
213210
print_compile_time=ctx.attr.print_compile_time,
214211
plugin_arg=plugin_arg,
215212
cp=compiler_classpath,
@@ -1023,9 +1020,9 @@ java_library(
10231020
def scala_repositories():
10241021
native.new_http_archive(
10251022
name = "scala",
1026-
strip_prefix = "scala-2.12.3",
1027-
sha256 = "2b796ab773fbedcc734ba881a6486d54180b699ade8ba7493e91912044267c8c",
1028-
url = "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.tgz",
1023+
strip_prefix = "scala-2.12.4",
1024+
sha256 = "9554a0ca31aa8701863e881281b1772370a87e993ce785bb24505f2431292a21",
1025+
url = "https://downloads.lightbend.com/scala/2.12.4/scala-2.12.4.tgz",
10291026
build_file_content = SCALA_BUILD_FILE,
10301027
)
10311028

0 commit comments

Comments
 (0)