diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2017-01-08 20:50:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 20:50:58 +0100 |
| commit | add9a03fc3a4fe61d53ddf956dfd6f451f19f46b (patch) | |
| tree | 19163e9d56058bda0205c3cf4e284027e6adf04b /project | |
| parent | 7113db7a638868edd72e5f1a89a16ed85641a20f (diff) | |
| parent | 0bca6b76ee6c7c9555707d03551593dd04b5fe81 (diff) | |
| download | dotty-add9a03fc3a4fe61d53ddf956dfd6f451f19f46b.tar.gz dotty-add9a03fc3a4fe61d53ddf956dfd6f451f19f46b.tar.bz2 dotty-add9a03fc3a4fe61d53ddf956dfd6f451f19f46b.zip | |
Merge pull request #1888 from dotty-staging/bump-version-011
Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOT
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 12 |
1 files changed, 3 insertions, 9 deletions
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() ) } """) |