Skip to content

Commit 4ac17b5

Browse files
committed
NIT compare Scala versions with coursier.core.Version
1 parent fee5492 commit 4ac17b5

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import scala.build.compiler.{ScalaCompiler, ScalaCompilerMaker}
1818
import scala.build.errors.*
1919
import scala.build.internal.resource.ResourceMapper
2020
import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
21-
import scala.build.options.ScalaVersionUtil.maybeScalaPatchVersion
21+
import scala.build.options.ScalaVersionUtil.asVersion
2222
import scala.build.options.*
2323
import scala.build.options.validation.ValidationException
2424
import scala.build.postprocessing.*
@@ -828,9 +828,7 @@ object Build {
828828

829829
val scalacReleaseV =
830830
// the -release flag is not supported for Scala 2.12.x < 2.12.5
831-
if params.scalaVersion.startsWith("2.12") &&
832-
params.scalaVersion.maybeScalaPatchVersion.exists(_ < 5)
833-
then Nil
831+
if params.scalaVersion.asVersion < "2.12.5".asVersion then Nil
834832
else
835833
releaseFlagVersion
836834
.map(v => List("-release", v).map(ScalacOpt(_)))

modules/options/src/main/scala/scala/build/options/ScalaVersionUtil.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,6 @@ object ScalaVersionUtil {
293293
}
294294

295295
extension (sv: String) {
296-
def maybeScalaPatchVersion: Option[Int] = sv
297-
.split('.').drop(2).headOption
298-
.flatMap(_.split('-').headOption)
299-
.flatMap(pv => Try(pv.toInt).toOption)
296+
def asVersion: Version = Version(sv)
300297
}
301298
}

0 commit comments

Comments
 (0)