mirror of https://github.com/sbt/sbt.git
Merge branch '0.13.13' into 0.13
* 0.13.13: Set version in launchconfig to 0.13.13 (automatic) Temporarily disable control/io for Scala 2.12 Set version to 0.13.13
This commit is contained in:
commit
9d3bda71ea
|
|
@ -7,7 +7,7 @@ import Sxr.sxr
|
|||
// but can be shared across the multi projects.
|
||||
def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
|
||||
organization := "org.scala-sbt",
|
||||
version := "0.13.13-SNAPSHOT",
|
||||
version := "0.13.13",
|
||||
bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"),
|
||||
bintrayRepository := s"ivy-${publishStatus.value}",
|
||||
bintrayPackage := "sbt",
|
||||
|
|
@ -155,7 +155,8 @@ lazy val controlProj = (project in utilPath / "control").
|
|||
baseSettings,
|
||||
Util.crossBuild,
|
||||
name := "Control",
|
||||
crossScalaVersions := Seq(scala210, scala211, scala212)
|
||||
crossScalaVersions := Seq(scala210, scala211)
|
||||
// crossScalaVersions := Seq(scala210, scala211, scala212) // sbt 0.13 is JDK 6, can't do 2.12
|
||||
)
|
||||
|
||||
lazy val collectionProj = (project in utilPath / "collection").
|
||||
|
|
@ -192,7 +193,8 @@ lazy val ioProj = (project in utilPath / "io").
|
|||
Util.crossBuild,
|
||||
name := "IO",
|
||||
libraryDependencies += scalaCompiler.value % Test,
|
||||
crossScalaVersions := Seq(scala210, scala211, scala212)
|
||||
crossScalaVersions := Seq(scala210, scala211)
|
||||
// crossScalaVersions := Seq(scala210, scala211, scala212) // sbt 0.13 is JDK 6, can't do 2.12
|
||||
)
|
||||
|
||||
// Utilities related to reflection, managing Scala versions, and custom class loaders
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13-RC3]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13]}
|
||||
class: sbt.ScriptMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13-RC3]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13]}
|
||||
class: sbt.ConsoleMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
[app]
|
||||
org: ${sbt.organization-org.scala-sbt}
|
||||
name: sbt
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13-RC3]}
|
||||
version: ${sbt.version-read(sbt.version)[0.13.13]}
|
||||
class: sbt.xMain
|
||||
components: xsbti,extra
|
||||
cross-versioned: ${sbt.cross.versioned-false}
|
||||
|
|
|
|||
Loading…
Reference in New Issue