From 6dcba499348de3f4c7794d128b919c99232ece6a Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 28 Oct 2016 12:02:36 +0100 Subject: [PATCH 1/3] Set version to 0.13.13 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4784a2ab8..e5e384dee 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", From 1af8aab2d22f6c86b6b2dd2fe7f426262f65a58a Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 28 Oct 2016 12:51:03 +0100 Subject: [PATCH 2/3] Temporarily disable control/io for Scala 2.12 --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index e5e384dee..c13379426 100644 --- a/build.sbt +++ b/build.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 From 673e89d087d25c9e7bdd3f3abf85fe103ae47631 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 28 Oct 2016 13:15:32 +0100 Subject: [PATCH 3/3] Set version in launchconfig to 0.13.13 (automatic) --- src/main/conscript/scalas/launchconfig | 2 +- src/main/conscript/screpl/launchconfig | 2 +- src/main/conscript/xsbt/launchconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 1b8023e93..f928489bf 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -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} diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index b11da3f6c..87e7b16ea 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -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} diff --git a/src/main/conscript/xsbt/launchconfig b/src/main/conscript/xsbt/launchconfig index 54cf72b17..666e0e420 100644 --- a/src/main/conscript/xsbt/launchconfig +++ b/src/main/conscript/xsbt/launchconfig @@ -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}