Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#24752 Fix timestamped versions #24845

Merged
merged 2 commits into from Apr 5, 2018
Merged

#24752 Fix timestamped versions #24845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f041a3
#24752 Fix timestamped versions
2m Apr 4, 2018
555981c
Add a comment
2m Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions project/AkkaBuild.scala
View file
Open in desktop
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this helps, thanks! 👍

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
Expand Down
2 changes: 1 addition & 1 deletion project/TimeStampede.scala
View file
Open in desktop
Expand Up @@ -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 = {
Expand Down