From 15723a71554f6f2f6d74f5abdd27bfe1674d294a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 8 Nov 2016 15:57:17 -0500 Subject: [PATCH] Cross publish to 2.12 --- build.sbt | 6 +++--- project/Dependencies.scala | 2 +- project/Release.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 4784a2ab8..eee530398 100644 --- a/build.sbt +++ b/build.sbt @@ -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", @@ -164,7 +164,7 @@ lazy val collectionProj = (project in utilPath / "collection"). Util.keywordsSettings, Util.crossBuild, name := "Collections", - crossScalaVersions := Seq(scala210, scala211) + crossScalaVersions := Seq(scala210, scala211, scala212) ) lazy val applyMacroProj = (project in utilPath / "appmacro"). @@ -212,7 +212,7 @@ lazy val completeProj = (project in utilPath / "complete"). Util.crossBuild, name := "Completion", libraryDependencies += jline, - crossScalaVersions := Seq(scala210, scala211) + crossScalaVersions := Seq(scala210, scala211, scala212) ) // logging diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e53ff9ff3..4a11f3f5b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { lazy val scala293 = "2.9.3" lazy val scala210 = "2.10.6" 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 ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cf13e211b2cb31f0d3b317289dca70eca3362f6" diff --git a/project/Release.scala b/project/Release.scala index 2c8d669fc..fd4d68811 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -17,6 +17,6 @@ object Release { ) def javaVersionCheckSettings = Seq( - javaVersionPrefix in javaVersionCheck := Some("1.6") + javaVersionPrefix in javaVersionCheck := Some("1.8") ) }