luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor Scala 3 syntax change

This commit is contained in:
Eugene Yokota 2022-12-26 23:47:36 -05:00
parent e1c4fd5f1d
commit a20d5205af
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Main.scala
View File

@ -48,17 +48,16 @@ final class xMain extends xsbti.AppMain:
new XMainConfiguration().run("xMain", configuration) new XMainConfiguration().run("xMain", configuration)
end xMain end xMain
private[sbt] object xMain { private[sbt] object xMain:
private[sbt] def dealiasBaseDirectory(config: xsbti.AppConfiguration): xsbti.AppConfiguration = { private[sbt] def dealiasBaseDirectory(config: xsbti.AppConfiguration): xsbti.AppConfiguration =
val dealiasedBase = config.baseDirectory.getCanonicalFile val dealiasedBase = config.baseDirectory.getCanonicalFile
if (config.baseDirectory == dealiasedBase) config if config.baseDirectory == dealiasedBase then config
else else
new xsbti.AppConfiguration { new xsbti.AppConfiguration {
override def arguments: Array[String] = config.arguments() override def arguments: Array[String] = config.arguments()
override val baseDirectory: File = dealiasedBase override val baseDirectory: File = dealiasedBase
override def provider: AppProvider = config.provider() override def provider: AppProvider = config.provider()
} }
}
private[sbt] def run(configuration: xsbti.AppConfiguration): xsbti.MainResult = { private[sbt] def run(configuration: xsbti.AppConfiguration): xsbti.MainResult = {
try { try {
@ -172,7 +171,7 @@ private[sbt] object xMain {
case _: UnsatisfiedLinkError => (None, None) case _: UnsatisfiedLinkError => (None, None)
} }
} }
} end xMain
final class ScriptMain extends xsbti.AppMain { final class ScriptMain extends xsbti.AppMain {
def run(configuration: xsbti.AppConfiguration): xsbti.MainResult = def run(configuration: xsbti.AppConfiguration): xsbti.MainResult =