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

Update to lm 2.0.0-alpha12

This commit is contained in:
Eugene Yokota 2023-11-24 16:36:14 -05:00
parent bde26f6c51
commit dd2dd44de3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Dependencies.scala
View File

@ -15,7 +15,7 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.8.0") private val ioVersion = nightlyVersion.getOrElse("1.8.0")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha11") sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha12")
val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha6") val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha6")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@ -80,7 +80,7 @@ object Dependencies {
def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore)
// val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10" // val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10"
val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha5" val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha6"
lazy val sjsonNewVersion = "0.13.0" lazy val sjsonNewVersion = "0.13.0"
def sjsonNew(n: String) = Def.setting( def sjsonNew(n: String) = Def.setting(

8
sbt-app/src/sbt-test/dependency-management/platform/build.sbt
View File

@ -5,11 +5,17 @@ platform := Platform.sjs1
// By default platformOpt field is set to None // By default platformOpt field is set to None
// Given %% lm engines will sustitute it with the subproject's platform suffix on `update` // Given %% lm engines will sustitute it with the subproject's platform suffix on `update`
libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0" libraryDependencies ++= Seq(
"com.github.scopt" %% "scopt" % "4.1.0",
"junit" % "junit" % "4.13.1",
)
TaskKey[Unit]("check") := { TaskKey[Unit]("check") := {
val ur = update.value val ur = update.value
val files = ur.matching(moduleFilter(organization = "com.github.scopt", name = "scopt_sjs1_2.13", revision = "*")) val files = ur.matching(moduleFilter(organization = "com.github.scopt", name = "scopt_sjs1_2.13", revision = "*"))
assert(files.nonEmpty, s"sjs1 scopt module was not found in update report: $ur") assert(files.nonEmpty, s"sjs1 scopt module was not found in update report: $ur")
val files2 = ur.matching(moduleFilter(organization = "junit", name = "junit", revision = "*"))
assert(files2.nonEmpty, s"junit module was not found in update report: $ur")
} }
csrCacheDirectory := baseDirectory.value / "coursier-cache" csrCacheDirectory := baseDirectory.value / "coursier-cache"