@@ -22,8 +22,7 @@ import scala.build.errors.{
2222 AmbiguousPlatformError ,
2323 BuildException ,
2424 ConfigDbException ,
25- Severity ,
26- ToolkitOptionMissingVersionError
25+ Severity
2726}
2827import scala .build .input .{Element , Inputs , ResourceDirectory , ScalaCliInvokeData }
2928import 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}
0 commit comments