luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporarily switch to sbt-assembly

This commit is contained in:
Eugene Yokota 2022-09-23 14:03:55 -04:00 committed by Adrien Piquerez
parent 36be86a0fc
commit 38be1db247
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -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),

2
project/Settings.scala
View File

@ -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"

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.7.1
sbt.version=1.8.0