Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't check for newer CLI versions when the --cli-version launcher param is passed (v1.4.0 and onwards, only) #2957

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Don't check for newer CLI versions when the --cli-version launcher param is passed (v1.4.0 and onwards, only) #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions modules/cli/src/main/scala/scala/cli/ScalaCli.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package scala.cli

import bloop.rifle.FailedToStartServerException
import coursier.core.Version
import sun.misc.{Signal, SignalHandler}

import java.io.{ByteArrayOutputStream, File, PrintStream}
Expand Down Expand Up @@ -236,9 +237,13 @@ object ScalaCli {
maybeLauncherOptions = Some(launcherOpts)
launcherOpts.cliVersion.map(_.trim).filter(_.nonEmpty) match {
case Some(ver) =>
val powerArgs = launcherOpts.powerOptions.toCliArgs
val scalaRunnerArgs = launcherOpts.scalaRunner.toCliArgs
val newArgs = powerArgs ++ scalaRunnerArgs ++ args0
val powerArgs = launcherOpts.powerOptions.toCliArgs
val initialScalaRunnerArgs = launcherOpts.scalaRunner
val finalScalaRunnerArgs =
// if the version was specified, it doesn't make sense to check for CLI updates
(if Version(ver) < Version("1.4.0") then initialScalaRunnerArgs
else initialScalaRunnerArgs.copy(skipCliUpdates = Some(true))).toCliArgs
val newArgs = powerArgs ++ finalScalaRunnerArgs ++ args0
LauncherCli.runAndExit(ver, launcherOpts, newArgs)
case _ if
javaMajorVersion < 17
Expand Down
3 changes: 2 additions & 1 deletion modules/cli/src/main/scala/scala/cli/commands/version/Version.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ object Version extends ScalaCommand[VersionOptions] {
else if options.scalaVersion then println(defaultScalaVersion)
else {
println(versionInfo)
if !options.offline then
val skipCliUpdates = ScalaCli.launcherOptions.scalaRunner.skipCliUpdates.getOrElse(false)
if !options.offline && !skipCliUpdates then
maybeNewerScalaCliVersion.foreach { v =>
logger.message(
s"""Your $fullRunnerName version is outdated. The newest version is $v
Expand Down
9 changes: 8 additions & 1 deletion modules/cli/src/main/scala/scala/cli/launcher/ScalaRunnerLauncherOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,14 @@ case class ScalaRunnerLauncherOptions(
)
@Hidden
@Tag(tags.implementation)
progName: Option[String] = None
progName: Option[String] = None,
@Group(HelpGroup.Launcher.toString)
@HelpMessage(
"This allows to skip checking for newest Scala CLI versions. --offline covers this scenario as well."
)
@Hidden
@Tag(tags.implementation)
skipCliUpdates: Option[Boolean] = None
) {
def toCliArgs: List[String] =
cliUserScalaVersion.toList.flatMap(v => List("--cli-default-scala-version", v)) ++
Expand Down
Loading