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.

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

Use SNAPSHOT for release when snapshot version #995

Merged
merged 1 commit into from
Jun 6, 2017

Conversation

keirlawson
Copy link
Contributor

Fixes #971 - feedback appreciated!

@lightbend-cla-validator
Copy link

Hi @keirlawson,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Lightbend Contributors License Agreement:

http://www.lightbend.com/contribute/cla

@keirlawson
Copy link
Contributor Author

I have signed the Lightbend CLA

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this :)

Implementation LGTM. I added some small remarks.


rpmLicense := Some("BSD")


Copy link
Contributor

Choose a reason for hiding this comment

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

A simple test task checking the rpmVersion would be nice. E.g. something like

TaskKey[Unit]("unzip") := {
  assert(rpmRelease.value === "SNAPSHOT", s"RPM has incorrect value ${rpmVersion.value}")
  assert(rpmMetadata.value.version === "...", s"RPM has incorrect value ${rpmMetadata.value.version}")
  ()
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@@ -59,11 +59,16 @@ object RpmPlugin extends AutoPlugin {

}

private def stripSnapshot(version: String): String = {
Copy link
Contributor

Choose a reason for hiding this comment

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

I would put the private methods at the bottom of the AutoPlugin to preserve a "general -> detailed" structure :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@keirlawson
Copy link
Contributor Author

Have moved helper method and added tests as suggested.

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Awesome 😍

@muuki88 muuki88 merged commit 8f5137c into sbt:master Jun 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants