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

Ensure --cli-default-scala-version is respected by --scalac-help #3048

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Ensure --cli-default-scala-version is respected by --scalac-help #3048

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
9 changes: 6 additions & 3 deletions modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,17 @@ abstract class ScalaCommand[T <: HasGlobalOptions](implicit myParser: Parser[T],
updatedScalacOptions = scalacOptions.withScalacExtraOptions(shared.scalacExtra)
if updatedScalacOptions.exists(ScalacOptions.ScalacPrintOptions)
logger = shared.logger
artifacts <- buildOptions.artifacts(logger, Scope.Main).toOption
fixedBuildOptions = buildOptions.copy(scalaOptions =
buildOptions.scalaOptions.copy(defaultScalaVersion = Some(ScalaCli.getDefaultScalaVersion))
)
artifacts <- fixedBuildOptions.artifacts(logger, Scope.Main).toOption
scalaArtifacts <- artifacts.scalaOpt
compilerClassPath = scalaArtifacts.compilerClassPath
scalaVersion = scalaArtifacts.params.scalaVersion
compileClassPath = artifacts.compileClassPath
simpleScalaCompiler = SimpleScalaCompiler("java", Nil, scaladoc = false)
javacOptions = buildOptions.javaOptions.javacOptions.map(_.value)
javaHome = buildOptions.javaHomeLocation().value
javacOptions = fixedBuildOptions.javaOptions.javacOptions.map(_.value)
javaHome = fixedBuildOptions.javaHomeLocation().value
} {
val exitCode = simpleScalaCompiler.runSimpleScalacLike(
scalaVersion,
Expand Down
15 changes: 15 additions & 0 deletions modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,4 +906,19 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
expect(r.out.trim() == sv)
}
}

test("scalac help respects --cli-default-scala-version") {
TestInputs.empty.fromRoot { root =>
val sv = Constants.scala3NextRc
val launcherVersionOverrideHelp =
os.proc(TestUtil.cli, "--cli-default-scala-version", sv, "--scalac-help")
.call(cwd = root).out.trim()
val standardVersionOverrideHelp =
os.proc(TestUtil.cli, "--scalac-help", "-S", sv)
.call(cwd = root).out.trim()
val migrationPrefix = sv.take(2) + (sv.charAt(2).asDigit + 1).toString
expect(launcherVersionOverrideHelp.contains(s"$migrationPrefix-migration"))
expect(launcherVersionOverrideHelp == standardVersionOverrideHelp)
}
}
}
Loading