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

Update version to 1.1.0-SNAPSHOT 

.. & fix project/cross-plugins-defaults.
This commit is contained in:
Dale Wijnand 2017-12-12 16:26:00 +00:00
parent 30fd81edf6
commit 7a8c89effc
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -9,7 +9,7 @@ def buildLevelSettings: Seq[Setting[_]] =
inThisBuild(
Seq(
organization := "org.scala-sbt",
version := "1.0.3-SNAPSHOT",
version := "1.1.0-SNAPSHOT",
description := "sbt is an interactive build tool",
bintrayOrganization := Some("sbt"),
bintrayRepository := {

12
sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
View File

@ -1,4 +1,4 @@
val baseSbt = "1.0"
val baseSbt = "1."
val buildCrossList = List("2.10.6", "2.11.11", "2.12.2")
scalaVersion in ThisBuild := "2.12.2"
@ -10,20 +10,20 @@ lazy val root = (project in file("."))
.settings(
sbtPlugin := true,
TaskKey[Unit]("check") := mkCheck("2.12", "1.0").value,
TaskKey[Unit]("check2") := mkCheck("2.10", "0.13").value
TaskKey[Unit]("check") := mkCheck("2.12", "1.0", "1.").value,
TaskKey[Unit]("check2") := mkCheck("2.10", "0.13", "0.13").value
)
lazy val app = (project in file("app"))
def mkCheck(scalaBinV: String, sbtBinVer: String) = Def task {
def mkCheck(scalaBinV: String, sbtBinVer: String, sbtVerPrefix: String) = Def task {
val crossV = (sbtVersion in pluginCrossBuild).value
val crossBinV = (sbtBinaryVersion in pluginCrossBuild).value
val sv = projectID.value.extraAttributes("e:scalaVersion")
assert(sbtVersion.value startsWith baseSbt, s"Wrong sbt version: ${sbtVersion.value}")
assert(sv == scalaBinV, s"Wrong e:scalaVersion: $sv")
assert(scalaBinaryVersion.value == scalaBinV, s"Wrong Scala binary version: ${scalaBinaryVersion.value}")
assert(crossV startsWith sbtBinVer, s"Wrong `sbtVersion in pluginCrossBuild`: $crossV")
assert(crossV startsWith sbtVerPrefix, s"Wrong `sbtVersion in pluginCrossBuild`: $crossV")
val ur = update.value
val cr = ur.configuration(Compile).get
@ -31,7 +31,7 @@ def mkCheck(scalaBinV: String, sbtBinVer: String) = Def task {
val plugSv = mr.module.extraAttributes("scalaVersion")
val plugSbtV = mr.module.extraAttributes("sbtVersion")
assert(plugSv == scalaBinV, s"Wrong plugin scalaVersion: $plugSv")
assert(plugSbtV == sbtBinVer, s"Wrong plugin scalaVersion: $sbtBinVer")
assert(plugSbtV == sbtBinVer, s"Wrong plugin sbtVersion: $plugSbtV")
// crossScalaVersions in app should not be affected, per se or after ^^
val appCrossScalaVersions = (crossScalaVersions in app).value.toList