raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Use CrossVersion.partialVersion instead of regex (#24032)

Browse source
This commit is contained in:
Arnout Engelen 2017-11-22 17:07:54 +01:00 • committed by Johan Andrén
parent 836f9612b8
commit 5f525779d8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
project/Whitesource.scala
View file

@ -9,8 +9,6 @@ object Whitesource extends AutoPlugin {
override def trigger = allRequirements
def majorMinor(version: String): Option[String] = """\d+\.\d+""".r.findFirstIn(version)
override lazy val projectSettings = Seq(
// do not change the value of whitesourceProduct
whitesourceProduct := "Lightbend Reactive Platform",
@ -18,8 +16,10 @@ object Whitesource extends AutoPlugin {
(moduleName in LocalRootProject).value + "-" + (
if (isSnapshot.value)
if (gitCurrentBranch.value == "master") "master"
else "adhoc"
else majorMinor((version in LocalRootProject).value).map(_ + "-stable").getOrElse("adhoc"))
else "adhoc"
else CrossVersion.partialVersion((version in LocalRootProject).value)
.map { case (major,minor) => s"$major.$minor-stable" }
.getOrElse("adhoc"))
},
whitesourceForceCheckAllDependencies := true,
whitesourceFailOnError := true,