From a6667dd112b1a497e18c0a43fbe38b01055a61e1 Mon Sep 17 00:00:00 2001
From: Thayne McCombs <thayne@lucidchart.com>
Date: Wed, 20 Sep 2023 17:12:31 -0600
Subject: [PATCH] Update rules_scala

So it doesn't have an error about using deprecated options anymore
---
 .bazelrc  | 3 ---
 WORKSPACE | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 5b83104..1fd90e1 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,9 +2,6 @@ startup --expand_configs_in_place
 
 common:ci --color=yes
 
-# At least until https://github.com/lucidsoftware/rules_scala/pull/40 is merged
-common --incompatible_java_common_parameters=false
-
 build:ci --verbose_failures
 build:ci --sandbox_debug
 build:ci --spawn_strategy=standalone
diff --git a/WORKSPACE b/WORKSPACE
index 330a410..49805a5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -153,11 +153,11 @@ protobuf_deps()
 
 # higherkindness/rules_scala (used for tests only)
 # TODO: Move tests into their own worskpace s.t. we don't need their dependenices here
-rules_scala_annex_version = "938ffdc24fb25a58220aa650948761073f1dd83b"
+rules_scala_annex_version = "d396b914cc81d14a278afedc6e7885201655825c"
 
 http_archive(
     name = "rules_scala_annex",
-    sha256 = "ae0cfd560a5238248d5f4c9fcde352e5dfc87cba5efd0b97e4c88ea839fd51b5",
+    sha256 = "cb6d0dc6f0b341dfc4e9239cf6cb09e9c9228a260a1075c2540efd43ccd1c461",
     strip_prefix = "rules_scala-{}".format(rules_scala_annex_version),
     type = "zip",
     url = "https://github.com/lucidsoftware/rules_scala/archive/{}.zip".format(rules_scala_annex_version),