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

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:
Dale Wijnand 2016-10-28 13:20:05 +01:00
parent bbc70632d0 673e89d087
commit 9d3bda71ea
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sbt
View File

@ -7,7 +7,7 @@ import Sxr.sxr
// but can be shared across the multi projects. // but can be shared across the multi projects.
def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq( def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
organization := "org.scala-sbt", organization := "org.scala-sbt",
version := "0.13.13-SNAPSHOT", version := "0.13.13",
bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"), bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"),
bintrayRepository := s"ivy-${publishStatus.value}", bintrayRepository := s"ivy-${publishStatus.value}",
bintrayPackage := "sbt", bintrayPackage := "sbt",
@ -155,7 +155,8 @@ lazy val controlProj = (project in utilPath / "control").
baseSettings, baseSettings,
Util.crossBuild, Util.crossBuild,
name := "Control", 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"). lazy val collectionProj = (project in utilPath / "collection").
@ -192,7 +193,8 @@ lazy val ioProj = (project in utilPath / "io").
Util.crossBuild, Util.crossBuild,
name := "IO", name := "IO",
libraryDependencies += scalaCompiler.value % Test, 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 // Utilities related to reflection, managing Scala versions, and custom class loaders

2
src/main/conscript/scalas/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: 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 class: sbt.ScriptMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}

2
src/main/conscript/screpl/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: 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 class: sbt.ConsoleMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}

2
src/main/conscript/xsbt/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: 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 class: sbt.xMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}