Skip to content

Commit 7073d9b

Browse files
committed
Remove unused Error class
Test toolkit default and warnings for latest
1 parent 64e1e12 commit 7073d9b

File tree

5 files changed

+276
-237
lines changed

5 files changed

+276
-237
lines changed

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ import scala.build.errors.{
2222
AmbiguousPlatformError,
2323
BuildException,
2424
ConfigDbException,
25-
Severity,
26-
ToolkitOptionMissingVersionError
25+
Severity
2726
}
2827
import scala.build.input.{Element, Inputs, ResourceDirectory, ScalaCliInvokeData}
2928
import scala.build.interactive.Interactive
@@ -399,13 +398,13 @@ final case class SharedOptions(
399398
SharedOptions.parseDependencies(
400399
dependencies.dependency.map(Positioned.none),
401400
ignoreErrors
402-
) ++ value(SharedOptions.resolveToolkitDependency(withToolkit, logger))
401+
) ++ SharedOptions.resolveToolkitDependency(withToolkit, logger)
403402
),
404403
extraCompileOnlyDependencies = ShadowingSeq.from(
405404
SharedOptions.parseDependencies(
406405
dependencies.compileOnlyDependency.map(Positioned.none),
407406
ignoreErrors
408-
) ++ value(SharedOptions.resolveToolkitDependency(withToolkit, logger))
407+
) ++ SharedOptions.resolveToolkitDependency(withToolkit, logger)
409408
)
410409
),
411410
internal = bo.InternalOptions(
@@ -728,22 +727,17 @@ object SharedOptions {
728727
private def resolveToolkitDependency(
729728
toolkitVersion: Option[String],
730729
logger: Logger
731-
): Either[BuildException, Seq[Positioned[AnyDependency]]] =
732-
if (toolkitVersion.contains(""))
733-
Left(ToolkitOptionMissingVersionError("an empty string"))
734-
else {
735-
if (
736-
toolkitVersion.contains("latest") || toolkitVersion.contains(Toolkit.typelevel + ":latest")
730+
): Seq[Positioned[AnyDependency]] = {
731+
if (
732+
toolkitVersion.contains("latest") || toolkitVersion.contains(Toolkit.typelevel + ":latest")
733+
)
734+
logger.message(
735+
s"""WARNING: using 'latest' for toolkit is deprecated, use 'default' to get more stable behaviour:
736+
| --toolkit ${toolkitVersion.map(_.replace("latest", "default")).getOrElse("default")}
737+
|""".stripMargin
737738
)
738-
logger.message(
739-
s"""WARNING: using 'latest' for toolkit is deprecated, use 'default' to get more stable behaviour:
740-
| --toolkit ${toolkitVersion.map(_.replace("latest", "default")).getOrElse("default")}
741-
|""".stripMargin
742-
)
743739

744-
Right(
745-
toolkitVersion.toList.map(Positioned.commandLine)
746-
.flatMap(Toolkit.resolveDependenciesWithRequirements(_).map(_.value))
747-
)
748-
}
740+
toolkitVersion.toList.map(Positioned.commandLine)
741+
.flatMap(Toolkit.resolveDependenciesWithRequirements(_).map(_.value))
742+
}
749743
}

modules/core/src/main/scala/scala/build/errors/ToolkitOptionMissingVersionError.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

modules/integration/src/test/scala/scala/cli/integration/RunScalaJsTestDefinitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
272272
val msg = "Hello"
273273
TestInputs(
274274
os.rel / "script.sc" ->
275-
s"""//> using toolkit latest
275+
s"""//> using toolkit default
276276
|//> using platform "scala-js"
277277
|import scala.scalajs.js
278278
|val console = js.Dynamic.global.console

modules/integration/src/test/scala/scala/cli/integration/RunScalaNativeTestDefinitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ trait RunScalaNativeTestDefinitions { _: RunTestDefinitions =>
304304
test("native defaults & toolkit latest") {
305305
TestInputs(
306306
os.rel / "script.sc" ->
307-
"""//> using toolkit latest
307+
"""//> using toolkit default
308308
|//> using platform "scala-native"
309309
|println(os.pwd)
310310
|""".stripMargin

0 commit comments

Comments
 (0)