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

IO 1.3.0-M10, and nightly version 

Fixes #305
This commit is contained in:
Eugene Yokota 2019-05-11 19:49:04 -04:00
parent acc1fd6b96
commit 3a0ce65362
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.sbt
View File

@ -7,6 +7,17 @@ val _ = {
sys.props += ("line.separator" -> "\n")
}
ThisBuild / git.baseVersion := "1.3.0"
ThisBuild / version := {
val old = (ThisBuild / version).value
nightlyVersion match {
case Some(v) => v
case _ =>
if (old contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"
else old
}
}
ThisBuild / Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
def commonSettings: Seq[Setting[_]] = Def.settings(
@ -61,12 +72,6 @@ lazy val lmRoot = (project in file("."))
Some(ScmInfo(url(s"https://github.com/$slug"), s"git@github.com:$slug.git"))
},
bintrayPackage := "librarymanagement",
git.baseVersion := "1.3.0",
version := {
val v = version.value
if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"
else v
}
)),
commonSettings,
name := "LM Root",
@ -93,7 +98,7 @@ lazy val lmCore = (project in file("core"))
scalaTest % Test,
scalaCheck % Test
),
libraryDependencies ++= scalaXml.value,
libraryDependencies += scalaXml,
resourceGenerators in Compile += Def
.task(
Util.generateVersionFile(

18
project/Dependencies.scala
View File

@ -5,8 +5,10 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala212 = "2.12.8"
private val ioVersion = "1.3.0-M7"
private val utilVersion = "1.3.0-M5"
def nightlyVersion: Option[String] = sys.props.get("sbt.build.version")
private val ioVersion = nightlyVersion.getOrElse("1.3.0-M10")
private val utilVersion = nightlyVersion.getOrElse("1.3.0-M5")
private val coursierVersion = "1.1.0-M7"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
@ -50,8 +52,8 @@ object Dependencies {
val jsch = "com.jcraft" % "jsch" % "0.1.54" intransitive ()
val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
val scalaXml = scala211Module("scala-xml", "1.0.5")
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5"
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.2.0"
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.6-SNAP5"
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
val sjsonnew = Def.setting {
"com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value
@ -61,12 +63,4 @@ object Dependencies {
}
val gigahorseOkhttp = "com.eed3si9n" %% "gigahorse-okhttp" % "0.4.0"
val okhttpUrlconnection = "com.squareup.okhttp3" % "okhttp-urlconnection" % "3.7.0"
private def scala211Module(name: String, moduleVersion: String) =
Def.setting {
scalaVersion.value match {
case sv if (sv startsWith "2.9.") || (sv startsWith "2.10.") => Nil
case _ => ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
}
}
}