Skip to content

Commit aa3bddb

Browse files
authored
Merge pull request #242 from lwronski/bugfix/update-standalone-launchers
Bugfix/update standalone launchers
2 parents d0a9370 + 7708398 commit aa3bddb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.sc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,9 +690,9 @@ object ci extends Module {
690690
val standaloneLauncherPath = scalaCliDir / "scala-cli.sh"
691691
val standaloneWindowsLauncherPath = scalaCliDir / "scala-cli.bat"
692692

693-
// clean target directory
694-
if (os.exists(targetDir)) os.remove.all(targetDir)
695-
os.makeDir.all(targetDir)
693+
// clean scala-cli directory
694+
if (os.exists(scalaCliDir)) os.remove.all(scalaCliDir)
695+
if (!os.exists(targetDir)) os.makeDir.all(targetDir)
696696

697697
val branch = "master"
698698
val repo = s"https://oauth2:${ghToken()}@github.com/VirtusLab/scala-cli.git"

modules/tasty-lib/src/main/scala/scala/build/tastylib/TastyVersions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object TastyVersions {
1616
scalaVersion: String,
1717
scalaCliVersion: String
1818
): Either[String, Boolean] =
19-
if (!scalaVersion.startsWith("3.") && scalaVersion != "3" ) Right(false)
19+
if (!scalaVersion.startsWith("3.") && scalaVersion != "3") Right(false)
2020
else
2121
scalaVersion.split('.')(1).toInt match {
2222
case scalaMinor if scalaMinor > LatestSupportedScala.MinorVersion =>

0 commit comments

Comments
 (0)