From be4eac97c608eb0d440188bdc4e60a287f353bf6 Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Tue, 2 Jul 2019 07:56:39 -0700 Subject: [PATCH 1/3] Elevate PreRelease SemVer --- .../src/main/scala/org/scalasteward/core/model/SemVer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/scala/org/scalasteward/core/model/SemVer.scala b/modules/core/src/main/scala/org/scalasteward/core/model/SemVer.scala index b278c0025b..f2a5016545 100644 --- a/modules/core/src/main/scala/org/scalasteward/core/model/SemVer.scala +++ b/modules/core/src/main/scala/org/scalasteward/core/model/SemVer.scala @@ -67,8 +67,8 @@ object SemVer { def getChange(from: SemVer, to: SemVer): Option[Change] = if (from.major =!= to.major) Some(Major) else if (from.minor =!= to.minor) Some(Minor) - else if (from.patch =!= to.patch) Some(Patch) else if (from.preRelease =!= to.preRelease) Some(PreRelease) + else if (from.patch =!= to.patch) Some(Patch) else if (from.buildMetadata =!= to.buildMetadata) Some(BuildMetadata) else None } From 3ec0b3691e0f0de1ec767b44f97366aca87e9176 Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Tue, 2 Jul 2019 07:58:48 -0700 Subject: [PATCH 2/3] Add Test for New Behavior --- .../src/test/scala/org/scalasteward/core/model/SemVerTest.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala b/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala index 12dfd9017b..60d0a4fb4c 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala @@ -61,5 +61,7 @@ class SemVerTest extends FunSuite with Matchers { SemVer.getChange(SemVer(2, 3, 4, Some("M1"), Some("1")), SemVer(2, 3, 4, Some("M1"), Some("2"))) shouldBe Some(Change.BuildMetadata) SemVer.getChange(SemVer(2, 3, 4, Some("M1"), None), SemVer(2, 3, 4, Some("M1"), None)) shouldBe None + SemVer.getChange(SemVer(0,20,0, Some("M4"), None), SemVer(0, 20, 3, None, None)) shouldBe + Some(Change.PreRelease) } } From adeb461f20137be047d8c2605d7635c9043b05c0 Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Tue, 2 Jul 2019 08:45:07 -0700 Subject: [PATCH 3/3] Fix Scalafmt --- .../src/test/scala/org/scalasteward/core/model/SemVerTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala b/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala index 60d0a4fb4c..5d73ba36ec 100644 --- a/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala +++ b/modules/core/src/test/scala/org/scalasteward/core/model/SemVerTest.scala @@ -61,7 +61,7 @@ class SemVerTest extends FunSuite with Matchers { SemVer.getChange(SemVer(2, 3, 4, Some("M1"), Some("1")), SemVer(2, 3, 4, Some("M1"), Some("2"))) shouldBe Some(Change.BuildMetadata) SemVer.getChange(SemVer(2, 3, 4, Some("M1"), None), SemVer(2, 3, 4, Some("M1"), None)) shouldBe None - SemVer.getChange(SemVer(0,20,0, Some("M4"), None), SemVer(0, 20, 3, None, None)) shouldBe + SemVer.getChange(SemVer(0, 20, 0, Some("M4"), None), SemVer(0, 20, 3, None, None)) shouldBe Some(Change.PreRelease) } }