Merge pull request #799 from mkurz/revert_workarounds

Revert "Workaround for scala-xml conflict" / sbt 1.8.0-RC1
playframework · Nov 7, 2022 · 61f44ff · 61f44ff
2 parents 9e87f0a + 126ee55
commit 61f44ff
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0-RC1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,10 +2,6 @@
  * Copyright (C) Lightbend Inc. <https://www.lightbend.com>
  */
 
-lazy val plugins = (project in file(".")).settings(
-  scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0
-)
-
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 resolvers += Resolver.typesafeRepo("releases")