Skip to content

Commit 66572df

Browse files
authored
Merge pull request #1332 from felixmulder/topic/snapshot-releases
Change versioning to SNAPSHOT and nightly releases for now
2 parents cc87bd3 + a78970c commit 66572df

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

project/Build.scala

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
99

1010
object DottyBuild extends Build {
1111

12+
val baseVersion = "0.1"
13+
val isNightly = sys.props.get("NIGHTLYBUILD") == Some("yes")
14+
1215
val jenkinsMemLimit = List("-Xmx1300m")
1316

1417
val JENKINS_BUILD = "dotty.jenkins.build"
@@ -25,8 +28,12 @@ object DottyBuild extends Build {
2528
override def settings: Seq[Setting[_]] = {
2629
super.settings ++ Seq(
2730
scalaVersion in Global := "2.11.5",
28-
version in Global :=
29-
"0.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-SNAPSHOT",
31+
version in Global := {
32+
if (isNightly)
33+
baseVersion + "-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
34+
else
35+
baseVersion + "-SNAPSHOT"
36+
},
3037
organization in Global := "ch.epfl.lamp",
3138
organizationName in Global := "LAMP/EPFL",
3239
organizationHomepage in Global := Some(url("http://lamp.epfl.ch")),
@@ -208,8 +215,12 @@ object DottyBuild extends Build {
208215
"org.scala-sbt" % "api" % sbtVersion.value % "test",
209216
"org.specs2" %% "specs2" % "2.3.11" % "test"
210217
),
211-
version :=
212-
"0.1.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-SNAPSHOT",
218+
version := {
219+
if (isNightly)
220+
"0.1.1-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
221+
else
222+
"0.1.1-SNAPSHOT"
223+
},
213224
// The sources should be published with crossPaths := false since they
214225
// need to be compiled by the project using the bridge.
215226
crossPaths := false,
@@ -334,6 +345,12 @@ object DottyInjectedPlugin extends AutoPlugin {
334345
}
335346
)
336347

348+
lazy val `scala-library` = project
349+
.settings(
350+
libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
351+
)
352+
.settings(publishing)
353+
337354
lazy val publishing = Seq(
338355
publishMavenStyle := true,
339356
publishArtifact := true,

0 commit comments

Comments
 (0)