Merge pull request playframework#592 from scala-steward/update/sbt-1.5.5

scala-steward · Aug 4, 2021 · eceb4ae · eceb4ae
2 parents d06fc11 + 2870fe3
commit eceb4ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -99,6 +99,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(

diff --git 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