Skip to content

Commit df852a0

Browse files
gkk-stripeNikhil Murthy
authored and
Nikhil Murthy
committed
Upgrade to Scala 2.12.4
The rules_scala ci detected that 2.12.4 doesn't fix bazel-contrib#305 so we keep the workaround for now.
1 parent b22f77f commit df852a0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

scala/scala.bzl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ DependencyAnalyzerMode: {dependency_analyzer_mode}
207207
manifest=ctx.outputs.manifest.path,
208208
# always append -YdisableFlatCpCaching, workaround for
209209
# https://github.com/bazelbuild/rules_scala/issues/305
210-
# remove once we upgrade to Scala 2.12.4
210+
# ~remove once we upgrade to Scala 2.12.4~
211+
# ^^ turns out that 2.12.4 didn't fix the issue, see:
212+
# https://github.com/bazelbuild/rules_scala/pull/310#issuecomment-337466097
211213
scala_opts=",".join(ctx.attr.scalacopts + ["-YdisableFlatCpCaching"]),
212214
print_compile_time=ctx.attr.print_compile_time,
213215
plugin_arg=plugin_arg,
@@ -1058,9 +1060,9 @@ java_library(
10581060
def scala_repositories():
10591061
native.new_http_archive(
10601062
name = "scala",
1061-
strip_prefix = "scala-2.12.3",
1062-
sha256 = "2b796ab773fbedcc734ba881a6486d54180b699ade8ba7493e91912044267c8c",
1063-
url = "https://downloads.lightbend.com/scala/2.12.3/scala-2.12.3.tgz",
1063+
strip_prefix = "scala-2.12.4",
1064+
sha256 = "9554a0ca31aa8701863e881281b1772370a87e993ce785bb24505f2431292a21",
1065+
url = "https://downloads.lightbend.com/scala/2.12.4/scala-2.12.4.tgz",
10641066
build_file_content = SCALA_BUILD_FILE,
10651067
)
10661068

0 commit comments

Comments
 (0)