From ef8d54c154d58d1df4ab6fe76d0fb05005421621 Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Thu, 26 Apr 2018 13:34:09 +0200 Subject: [PATCH] Fix RCs publishing --- project/Build.scala | 2 +- sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 4297b5463f25..df3c32e455cc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -864,7 +864,7 @@ object Build { settings(commonSettings). settings( version := { - val base = "0.2.1" + val base = "0.2.2" if (isRelease) base else base + "-SNAPSHOT" }, diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala index 45768ac0d5a8..c971e9020582 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala @@ -179,6 +179,14 @@ object DottyPlugin extends AutoPlugin { dottyBridge else scalaBridge + }, + + // Needed for RCs publishing + scalaBinaryVersion := { + if (isDotty.value) + scalaVersion.value.split("\\.").take(2).mkString(".") + else + scalaBinaryVersion.value } ) }