From bd89c3578b418cf9735be2e8a611ce429de7cfd2 Mon Sep 17 00:00:00 2001
From: Jonathon Belotti <jonathon@canva.com>
Date: Tue, 10 May 2022 11:26:47 +0000
Subject: [PATCH] Get rules_scala working

---
 .bazelrc        | 5 ++++-
 WORKSPACE.bazel | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 0bc779d..7970d2d 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -10,7 +10,10 @@ common --incompatible_java_common_parameters=false
 # --javabase set for Github Codespaces which doesn't have Java installed.
 build --java_runtime_version=remotejdk_11
 build --java_language_version=11
-build --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
+build --java_runtime_version=remotejdk_11
+build --tool_java_runtime_version=remotejdk_11
+# Required for rules_scala
+build --javabase=@bazel_tools//tools/jdk:remote_jdk11
 
 build --sandbox_default_allow_network=false
 build --remote_local_fallback
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index da5d205..98352b4 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -155,10 +155,10 @@ http_archive(
     url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
 )
 
-rules_scala_version = "e7a948ad1948058a7a5ddfbd9d1629d6db839933"
+rules_scala_version = "62d2af160ce8ec298a72c92efcf913aac61867ee"
 http_archive(
     name = "io_bazel_rules_scala",
-    sha256 = "76e1abb8a54f61ada974e6e9af689c59fd9f0518b49be6be7a631ce9fa45f236",
+    sha256 = "6b415064d1b276b4a717bfd38132a53d11102ae01a75c4b3a962771d12f01335",
     strip_prefix = "rules_scala-%s" % rules_scala_version,
     type = "zip",
     url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version,