#24752 Fix timestamped versions (#24845)

* #24752 Fix timestamped versions

* Add a comment
This commit is contained in:
Martynas Mickevičius 2018-04-05 14:50:24 +03:00 committed by Konrad `ktoso` Malawski
parent 90541b20db
commit 8f40eb15a5
2 changed files with 6 additions and 3 deletions

View file

@ -20,13 +20,16 @@ object AkkaBuild {
lazy val buildSettings = Dependencies.Versions ++ Seq(
organization := "com.typesafe.akka",
version := "2.5-SNAPSHOT")
// use the same value as in the build scope, so it can be overriden by stampVersion
version := (version in ThisBuild).value)
lazy val rootSettings = Release.settings ++
UnidocRoot.akkaSettings ++
Formatting.formatSettings ++
Protobuf.settings ++ Seq(
parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", parallelExecutionByDefault.toString).toBoolean)
parallelExecution in GlobalScope := System.getProperty("akka.parallelExecution", parallelExecutionByDefault.toString).toBoolean,
version in ThisBuild := "2.5-SNAPSHOT"
)
lazy val mayChangeSettings = Seq(
description := """|This module of Akka is marked as

View file

@ -23,7 +23,7 @@ object TimeStampede extends AutoPlugin {
def stampVersion = Command.command("stampVersion") { state
val extracted = Project.extract(state)
extracted.append(List(version in ThisBuild ~= stamp), state)
extracted.appendWithSession(List(version in ThisBuild ~= stamp), state)
}
def stamp(version: String): String = {