Skip to content

Commit 08aa9f2

Browse files
authored
Use Constants.defaultScalaVersion instead of properties version (#955)
1 parent a963ed0 commit 08aa9f2

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

modules/cli/src/main/scala/scala/cli/launcher/LauncherCli.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ object LauncherCli {
7171
}
7272

7373
def scalaCliScalaVersion(cliVersion: String): String =
74-
if (cliVersion == "nightly") Properties.versionNumberString
74+
if (cliVersion == "nightly") Constants.defaultScalaVersion
7575
else if (Version(cliVersion) <= Version("0.1.2")) Constants.defaultScala212Version
76-
else Properties.versionNumberString
76+
else if (Version(cliVersion) <= Version("0.1.4")) Constants.defaultScala213Version
77+
else Constants.defaultScalaVersion
7778

7879
def resolveNightlyScalaCliVersion(
7980
cache: FileCache[Task],

modules/cli/src/test/scala/cli/tests/LauncherCliTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LauncherCliTest extends munit.FunSuite {
1414
test("resolve nightly version") {
1515
val logger = TestLogger()
1616
val cache = CoursierOptions().coursierCache(logger.coursierLogger(""))
17-
val scalaParameters = ScalaParameters(Properties.versionNumberString)
17+
val scalaParameters = ScalaParameters(Constants.defaultScalaVersion)
1818

1919
val nightlyCliVersion = LauncherCli.resolveNightlyScalaCliVersion(cache, scalaParameters)
2020
expect(nightlyCliVersion.endsWith("-SNAPSHOT"))
@@ -24,7 +24,7 @@ class LauncherCliTest extends munit.FunSuite {
2424
"0.1.2" -> Constants.defaultScala212Version,
2525
"0.1.1+43-g15666b67-SNAPSHOT" -> Constants.defaultScala212Version,
2626
"0.1.3" -> Constants.defaultScala213Version,
27-
"nightly" -> Properties.versionNumberString
27+
"nightly" -> Constants.defaultScalaVersion
2828
)
2929

3030
for ((cliVersion, expectedScalaVersion) <- expectedScalaCliVersions)

modules/options/src/main/scala-3.1/scala/build/CoursierUtils.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import coursier.core.{Module, Dependency => CDependency}
66
import coursier.parse.{DependencyParser, ModuleParser}
77

88
import dependency.{DependencyLike, NameAttributes}
9+
import scala.build.internal.Constants
910

1011
def noArgs(args: Expr[Seq[Any]])(using Quotes): Unit = {} // TODO
1112

@@ -23,15 +24,15 @@ object CoursierUtils {
2324
def parseModule(cs: Expr[StringContext], args: Expr[Seq[Any]])(using Quotes): Expr[Module] =
2425
noArgs(args)
2526
val modString = extractString(cs)
26-
ModuleParser.module(modString, scala.util.Properties.versionNumberString) match {
27+
ModuleParser.module(modString, Constants.defaultScalaVersion) match {
2728
case Left(error) =>
2829
quotes.reflect.report.error(error)
2930
???
3031
case Right(_) =>
3132
'{
3233
ModuleParser.module(
3334
${ Expr(modString) },
34-
scala.util.Properties.versionNumberString
35+
Constants.defaultScalaVersion
3536
).getOrElse(???)
3637
}
3738
}

0 commit comments

Comments
 (0)