Merge pull request #231 from kevin-lee/task/230/replace-DecVer-with-D…

…ecVerExt Close #230 - Replace `DecVer` with `DecVerExt`, and rename `DecVerExt` to `DecVer`
kevin-lee · Aug 25, 2024 · b62c657 · b62c657
2 parents 6407806 + b29d2f6
commit b62c657
Show file tree

Hide file tree

Showing 30 changed files with 2,805 additions and 3,204 deletions.
diff --git a/modules/just-semver-core/shared/src/main/scala-2/just/decver/DecVer.scala b/modules/just-semver-core/shared/src/main/scala-2/just/decver/DecVer.scala
diff --git a/modules/just-semver-core/shared/src/main/scala-2/just/semver/SemVer.scala b/modules/just-semver-core/shared/src/main/scala-2/just/semver/SemVer.scala
@@ -1,7 +1,7 @@
 package just.semver
 
 import just.Common._
-import just.decver.DecVer
+//import just.decver.DecVer
 import just.semver.AdditionalInfo.{BuildMetaInfo, PreRelease}
 import just.semver.SemVer.{Major, Minor, Patch}
 import just.semver.matcher.SemVerMatchers
@@ -93,7 +93,7 @@ object SemVer {
         .unsafeParse(semVerMatchers)
         .matches(semVer)
 
-    def toDecVer: DecVer = DecVer.fromSemVer(semVer)
+//    def toDecVer: DecVer = DecVer.fromSemVer(semVer)
   }
 
   def majorMinorPatch(semVer: SemVer): (SemVer.Major, SemVer.Minor, SemVer.Patch) =
@@ -177,7 +177,7 @@ object SemVer {
   def increasePatch(semVer: SemVer): SemVer =
     semVer.copy(patch = Patch(semVer.patch.value + 1))
 
-  def fromDecVer(decVer: DecVer): SemVer =
-    SemVer.semVer(SemVer.Major(decVer.major.value), SemVer.Minor(decVer.minor.value), patch0)
+//  def fromDecVer(decVer: DecVer): SemVer =
+//    SemVer.semVer(SemVer.Major(decVer.major.value), SemVer.Minor(decVer.minor.value), patch0)
 
 }
diff --git a/modules/just-semver-core/shared/src/main/scala-3/just/decver/DecVer.scala b/modules/just-semver-core/shared/src/main/scala-3/just/decver/DecVer.scala
diff --git a/modules/just-semver-core/shared/src/main/scala-3/just/semver/SemVer.scala b/modules/just-semver-core/shared/src/main/scala-3/just/semver/SemVer.scala
@@ -1,7 +1,7 @@
 package just.semver
 
 import just.Common.*
-import just.decver.DecVer
+//import just.decver.DecVer
 import just.semver.AdditionalInfo.{BuildMetaInfo, PreRelease}
 import just.semver.SemVer.{Major, Minor, Patch}
 import just.semver.matcher.SemVerMatchers
@@ -130,7 +130,7 @@ object SemVer {
         .unsafeParse(semVerMatchers)
         .matches(semVer)
 
-    def toDecVer: DecVer = DecVer.fromSemVer(semVer)
+//    def toDecVer: DecVer = DecVer.fromSemVer(semVer)
 
   }
 
@@ -197,7 +197,7 @@ object SemVer {
   def increasePatch(semVer: SemVer): SemVer =
     semVer.copy(patch = Patch(semVer.patch.value + 1))
 
-  def fromDecVer(decVer: DecVer): SemVer =
-    SemVer.semVer(SemVer.Major(decVer.major.value), SemVer.Minor(decVer.minor.value), patch0)
+//  def fromDecVer(decVer: DecVer): SemVer =
+//    SemVer.semVer(SemVer.Major(decVer.major.value), SemVer.Minor(decVer.minor.value), patch0)
 
 }