From 97bec66999be794935ee4e6b085de76da8b31625 Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Tue, 3 Aug 2021 09:52:13 +0200
Subject: [PATCH 1/2] sbt 1.5.5 (was 1.3.13)

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 8101f8775..a5c75cfca 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,4 +1,4 @@
 #
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
-sbt.version=1.3.13
+sbt.version=1.5.5

From 2870fe34a6ec86439fcbae73bcb49151596073c2 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 3 Aug 2021 17:11:44 -0700
Subject: [PATCH 2/2] resolve scala-java8-compat version conflict

---
 build.sbt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.sbt b/build.sbt
index 903d7ee08..bd7c517b6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -102,6 +102,8 @@ lazy val commonSettings = Def.settings(
   ),
   Compile / javacOptions ++= javacSettings,
   Test / javacOptions ++= javacSettings,
+  // Akka brings in 0.9.0, but we want 1.0.0:
+  libraryDependencySchemes += "org.scala-lang.modules" %% "scala-java8-compat" % "always",
   headerLicense := {
     Some(
       HeaderLicense.Custom(