From 0bca6b76ee6c7c9555707d03551593dd04b5fe81 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 8 Jan 2017 20:04:52 +0100 Subject: Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOT This is useful for two reasons: - All published Scala versions are of the form a.b.c and some tooling expect that, like sbt CrossVersion API. - Using 0.1.1 instead of 0.1.0 means that we match the version number of dotty-sbt-bridge, this is simpler and means that in the future sbt could automatically choose the correct version of dotty-sbt-bridge so that the user does not need to specify scalaCompilerBridgeSource in his build.sbt Note: it's awful that we have hardcoded paths to jars and that I had to change them, but I won't fix that now. --- project/Build.scala | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'project') diff --git a/project/Build.scala b/project/Build.scala index 5fa3eb4d4..56f381cda 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -11,7 +11,7 @@ import sbt.Package.ManifestAttributes object DottyBuild extends Build { - val baseVersion = "0.1" + val baseVersion = "0.1.1" val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes") val jenkinsMemLimit = List("-Xmx1500m") @@ -414,12 +414,6 @@ object DottyBuild extends Build { "org.scala-sbt" % "api" % sbtVersion.value % "test", "org.specs2" %% "specs2" % "2.3.11" % "test" ), - version := { - if (isNightly) - "0.1.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" - else - "0.1.1-SNAPSHOT" - }, // The sources should be published with crossPaths := false since they // need to be compiled by the project using the bridge. crossPaths := false, @@ -455,13 +449,13 @@ object DottyInjectedPlugin extends AutoPlugin { override def trigger = allRequirements override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", + scalaVersion := "0.1.1-SNAPSHOT", scalaOrganization := "ch.epfl.lamp", scalacOptions += "-language:Scala2", scalaBinaryVersion := "2.11", autoScalaLibrary := false, libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % "0.1.1-SNAPSHOT" % "component").sources() + scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-sbt-bridge" % scalaVersion.value % "component").sources() ) } """) -- cgit v1.2.3