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

Cross publish to 2.12

This commit is contained in:
Eugene Yokota 2016-11-08 15:57:17 -05:00
parent 462ee042ad
commit 15723a7155
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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",
@ -164,7 +164,7 @@ lazy val collectionProj = (project in utilPath / "collection").
Util.keywordsSettings, Util.keywordsSettings,
Util.crossBuild, Util.crossBuild,
name := "Collections", name := "Collections",
crossScalaVersions := Seq(scala210, scala211) crossScalaVersions := Seq(scala210, scala211, scala212)
) )
lazy val applyMacroProj = (project in utilPath / "appmacro"). lazy val applyMacroProj = (project in utilPath / "appmacro").
@ -212,7 +212,7 @@ lazy val completeProj = (project in utilPath / "complete").
Util.crossBuild, Util.crossBuild,
name := "Completion", name := "Completion",
libraryDependencies += jline, libraryDependencies += jline,
crossScalaVersions := Seq(scala210, scala211) crossScalaVersions := Seq(scala210, scala211, scala212)
) )
// logging // logging

2
project/Dependencies.scala
View File

@ -7,7 +7,7 @@ object Dependencies {
lazy val scala293 = "2.9.3" lazy val scala293 = "2.9.3"
lazy val scala210 = "2.10.6" lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.8" lazy val scala211 = "2.11.8"
lazy val scala212 = "2.12.0-RC2" lazy val scala212 = "2.12.0"
lazy val jline = "jline" % "jline" % "2.13" lazy val jline = "jline" % "jline" % "2.13"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cf13e211b2cb31f0d3b317289dca70eca3362f6" lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cf13e211b2cb31f0d3b317289dca70eca3362f6"

2
project/Release.scala
View File

@ -17,6 +17,6 @@ object Release {
) )
def javaVersionCheckSettings = Seq( def javaVersionCheckSettings = Seq(
javaVersionPrefix in javaVersionCheck := Some("1.6") javaVersionPrefix in javaVersionCheck := Some("1.8")
) )
} }