diff --git a/build.sbt b/build.sbt index 758facafb..3f9dac58e 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,8 @@ inThisBuild(List( case v => v } }, - version := "2.0.0-alpha1-SNAPSHOT", + version := "2.0.0-alpha4-SNAPSHOT", + scalaVersion := scala3, )) ThisBuild / assemblyMergeStrategy := { @@ -51,7 +52,7 @@ ThisBuild / assemblyMergeStrategy := { val coursierVersion0 = "2.1.0-M5" val lmVersion = "1.3.4" val lm2_13Version = "1.5.0-M3" -val lm3Version = "2.0.0-alpha2" +val lm3Version = "2.0.0-alpha8" lazy val scalafixGen = Def.taskDyn { val root = (ThisBuild / baseDirectory).value.toURI.toString @@ -196,6 +197,7 @@ lazy val `lm-coursier-shaded` = project ("io.get-coursier" %% "coursier" % coursierVersion0).cross(CrossVersion.for3Use2_13), "net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided, ("org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1").cross(CrossVersion.for3Use2_13), + ("org.scala-lang.modules" %% "scala-xml" % "2.1.0").cross(CrossVersion.for3Use2_13), // "org.scala-lang.modules" %% "scala-xml" % "2.1.0", // depending on that one so that it doesn't get shaded lmIvy.value, ("org.scalatest" %% "scalatest" % "3.2.13" % Test).cross(CrossVersion.for3Use2_13), diff --git a/project/Settings.scala b/project/Settings.scala index e43a53178..ebec1e4c4 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -11,7 +11,7 @@ object Settings { def scala212 = "2.12.16" def scala213 = "2.13.8" - def scala3 = "3.1.3" + def scala3 = "3.2.1" def targetSbtVersion = "1.2.8" diff --git a/project/build.properties b/project/build.properties index 22af2628c..8b9a0b0ab 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.8.0