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

lm-coursier 1.1.0-M14-2

This commit is contained in:
Eugene Yokota 2019-05-13 13:59:58 -04:00
parent 41197a9c14
commit 3f5a872001
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sbt
View File

@ -6,13 +6,17 @@ import local.Scripted
import scala.xml.{ Node => XmlNode, NodeSeq => XmlNodeSeq, _ } import scala.xml.{ Node => XmlNode, NodeSeq => XmlNodeSeq, _ }
import scala.xml.transform.{ RewriteRule, RuleTransformer } import scala.xml.transform.{ RewriteRule, RuleTransformer }
ThisBuild / version := {
val v = "1.3.0-SNAPSHOT"
nightlyVersion.getOrElse(v)
}
// ThisBuild settings take lower precedence, // ThisBuild settings take lower precedence,
// but can be shared across the multi projects. // but can be shared across the multi projects.
def buildLevelSettings: Seq[Setting[_]] = def buildLevelSettings: Seq[Setting[_]] =
inThisBuild( inThisBuild(
Seq( Seq(
organization := "org.scala-sbt", organization := "org.scala-sbt",
version := "1.3.0-SNAPSHOT",
description := "sbt is an interactive build tool", description := "sbt is an interactive build tool",
bintrayOrganization := Some("sbt"), bintrayOrganization := Some("sbt"),
bintrayRepository := { bintrayRepository := {

22
project/Dependencies.scala
View File

@ -7,16 +7,17 @@ object Dependencies {
val scala212 = "2.12.8" val scala212 = "2.12.8"
lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212 val baseScalaVersion = scala212
def nightlyVersion: Option[String] = sys.props.get("sbt.build.version")
// sbt modules // sbt modules
private val ioVersion = "1.3.0-M10" private val ioVersion = nightlyVersion.getOrElse("1.3.0-M10")
private val utilVersion = "1.3.0-M6" private val utilVersion = nightlyVersion.getOrElse("1.3.0-M7")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version") match { sys.props.get("sbt.build.lm.version") match {
case Some(version) => version case Some(version) => version
case _ => "1.3.0-M3" case _ => nightlyVersion.getOrElse("1.3.0-M3")
} }
val zincVersion = "1.3.0-M4" val zincVersion = nightlyVersion.getOrElse("1.3.0-M4")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@ -64,11 +65,12 @@ object Dependencies {
projectName: String, projectName: String,
moduleId: ModuleID, moduleId: ModuleID,
c: Option[Configuration] = None c: Option[Configuration] = None
) = { ) = {
val m = moduleId.withConfigurations(c.map(_.name)) val m = moduleId.withConfigurations(c.map(_.name))
path match { path match {
case Some(f) => p dependsOn ClasspathDependency(ProjectRef(file(f), projectName), c.map(_.name)) case Some(f) =>
case None => p settings (libraryDependencies += m, dependencyOverrides += m) p dependsOn ClasspathDependency(ProjectRef(file(f), projectName), c.map(_.name))
case None => p settings (libraryDependencies += m, dependencyOverrides += m)
} }
} }
@ -110,7 +112,7 @@ object Dependencies {
def addSbtZincCompileCore(p: Project): Project = def addSbtZincCompileCore(p: Project): Project =
addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore) addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore)
val lmCoursierVersion = "1.1.0-M14-1" val lmCoursierVersion = "1.1.0-M14-2"
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion
val sjsonNewScalaJson = Def.setting { val sjsonNewScalaJson = Def.setting {
@ -128,8 +130,8 @@ object Dependencies {
("org.scala-lang.modules" %% name % moduleVersion) :: Nil ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
) )
val scalaXml = scala211Module("scala-xml", "1.1.1") val scalaXml = scala211Module("scala-xml", "1.2.0")
val scalaParsers = scala211Module("scala-parser-combinators", "1.1.1") val scalaParsers = scala211Module("scala-parser-combinators", "1.1.2")
def log4jVersion = "2.11.2" def log4jVersion = "2.11.2"
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion