Merge pull request #665 from alexarchambault/prepare-scala-2.13-cli

Prepare to build CLI with Scala 2.13

Author: alexarchambault

modules/build/src/main/java/scala/build/internal/JniGetWinDirs.java

@@ -0,0 +1,17 @@
+package scala.build.internal;
+
+import java.util.ArrayList;
+
+import coursier.cache.shaded.dirs.GetWinDirs;
+import coursier.jniutils.WindowsKnownFolders;
+
+public class JniGetWinDirs implements GetWinDirs {
+  @Override
+  public String[] getWinDirs(String... guids) {
+    ArrayList<String> list = new ArrayList<>();
+    for (int i = 0; i < guids.length; i++) {
+      list.add(WindowsKnownFolders.knownFolderPath("{" + guids[i] + "}"));
+    }
+    return list.toArray(new String[list.size()]);
+  }
+}

modules/build/src/main/scala/scala/build/Directories.scala

@@ -2,6 +2,7 @@ package scala.build
 
 import coursier.cache.shaded.dirs.{GetWinDirs, ProjectDirectories}
 
+import scala.build.internal.JniGetWinDirs
 import scala.util.Properties
 
 trait Directories {
@@ -59,14 +60,7 @@ object Directories {
   def default(): Directories = {
     val getWinDirs: GetWinDirs =
       if (coursier.paths.Util.useJni())
-        new GetWinDirs {
-          def getWinDirs(guids: String*) =
-            guids
-              .map { guid =>
-                coursier.jniutils.WindowsKnownFolders.knownFolderPath("{" + guid + "}")
-              }
-              .toArray
-        }
+        new JniGetWinDirs
       else
         GetWinDirs.powerShellBased
 

modules/build/src/main/scala/scala/build/Inputs.scala

@@ -33,7 +33,7 @@ final case class Inputs(
     }
 
   def sourceFiles(): Seq[Inputs.SourceFile] =
-    singleFiles.collect {
+    singleFiles().collect {
       case f: Inputs.SourceFile => f
     }
 

modules/build/src/main/scala/scala/build/internal/Name.scala

@@ -112,6 +112,6 @@ object Name {
         !s.contains(blockCommentStart) &&
         !s.contains(lineCommentStart)
 
-      if (valid) s else '`' + s + '`'
+      if (valid) s else "`" + s + '`'
     }
 }

modules/build/src/main/scala/scala/build/internal/Runner.scala

@@ -189,13 +189,13 @@ object Runner {
       AsmTestRunner.taskDefs(
         classPath,
         keepJars = false,
-        framework.fingerprints(),
+        framework.fingerprints().toIndexedSeq,
         parentInspector
       ).toArray
 
     val runner       = framework.runner(args.toArray, Array(), null)
     val initialTasks = runner.tasks(taskDefs)
-    val events       = TestRunner.runTasks(initialTasks, System.out)
+    val events       = TestRunner.runTasks(initialTasks.toIndexedSeq, System.out)
 
     val doneMsg = runner.done()
     if (doneMsg.nonEmpty)

modules/build/src/main/scala/scala/build/internal/ScalaParse.scala

@@ -25,7 +25,7 @@ object ScalaParse {
     s"$fileName:$lineColIndex expected $expected$newLine$locationString"
   }
 
-  def Header[_: P]: P[Seq[(Int, Int)]] = {
+  def Header[X: P]: P[Seq[(Int, Int)]] = {
     def PkgAsEmptyList = P(TopPkgSeq).map(_ => List.empty[(Int, Int)])
     def ImportStartEnd = P(Index ~ Import ~ Index).map(List(_))
     def TopStat        = P(PkgAsEmptyList | ImportStartEnd)
@@ -34,9 +34,9 @@ object ScalaParse {
   }
 
   // For some reason Scala doesn't import this by default
-  private def `_`[_: P] = scalaparse.Scala.`_`
+  private def `_`[X: P] = scalaparse.Scala.`_`
 
-  def ImportSplitter[_: P]: P[Seq[ImportTree]] = {
+  def ImportSplitter[X: P]: P[Seq[ImportTree]] = {
     def IdParser   = P((Id | `_`).!).map(s => if (s(0) == '`') s.drop(1).dropRight(1) else s)
     def Selector   = P(IdParser ~ (`=>` ~/ IdParser).?)
     def Selectors  = P("{" ~/ Selector.rep(sep = ","./) ~ "}")

modules/build/src/main/scala/scala/build/options/ScalaNativeOptions.scala

@@ -48,7 +48,7 @@ final case class ScalaNativeOptions(
     .map(Paths.get(_))
     .getOrElse(sn.Discover.clang())
   private def clangCliOption(): List[String] =
-    List("--clang", clangPath.toString())
+    List("--clang", clangPath().toString())
 
   private def clangppPath() = clangpp
     .filter(_.nonEmpty)
@@ -63,10 +63,10 @@ final case class ScalaNativeOptions(
     compileOptions ++ (if (compileDefaults.getOrElse(true)) sn.Discover.compileOptions() else Nil)
 
   private def linkingCliOptions(): List[String] =
-    finalLinkingOptions.flatMap(option => List("--linking-option", option))
+    finalLinkingOptions().flatMap(option => List("--linking-option", option))
 
   private def compileCliOptions(): List[String] =
-    finalCompileOptions.flatMap(option => List("--compile-option", option))
+    finalCompileOptions().flatMap(option => List("--compile-option", option))
 
   def platformSuffix: String =
     "native" + ScalaVersion.nativeBinary(finalVersion).getOrElse(finalVersion)

modules/build/src/main/scala/scala/build/preprocessing/ScalaPreprocessor.scala

@@ -213,7 +213,6 @@ case object ScalaPreprocessor extends Preprocessor {
     // TODO Report error if indicesOrErrorMsg.isLeft?
 
     val importTrees = indicesOrErrorMsg
-      .right
       .toSeq
       .iterator
       .flatMap(_.iterator)
@@ -380,7 +379,7 @@ case object ScalaPreprocessor extends Preprocessor {
       def getDirectives(directives: UsingDirectives) =
         directives.getAst() match {
           case ud: UsingDefs =>
-            ud.getUsingDefs().asScala
+            ud.getUsingDefs().asScala.toSeq
           case _ =>
             Nil
         }
@@ -429,7 +428,10 @@ case object ScalaPreprocessor extends Preprocessor {
 
       val flattened = usedDirectives.getFlattenedMap.asScala.toSeq
       val strictDirectives =
-        flattened.map { case (k, l) => StrictDirective(k.getPath.asScala.mkString("."), l.asScala) }
+        flattened.map {
+          case (k, l) =>
+            StrictDirective(k.getPath.asScala.mkString("."), l.asScala.toSeq)
+        }
 
       val offset =
         if (usedDirectives.getKind() != UsingDirectiveKind.Code) 0
@@ -438,7 +440,7 @@ case object ScalaPreprocessor extends Preprocessor {
     }
     else {
       val errors0 = errors.map(diag => new MalformedDirectiveError(diag.message, diag.positions))
-      Left(CompositeBuildException(errors0))
+      Left(CompositeBuildException(errors0.toSeq))
     }
   }
 

modules/build/src/test/scala/scala/build/tests/BuildTests.scala

@@ -806,7 +806,7 @@ class BuildTests extends munit.FunSuite {
     )
     testInputs.withBuild(buildOptions, buildThreads, bloopConfig) { (_, _, maybeBuild) =>
       assert(maybeBuild.isLeft)
-      assert(maybeBuild.left.get.isInstanceOf[ScalaNativeCompatibilityError])
+      assert(maybeBuild.swap.toOption.get.isInstanceOf[ScalaNativeCompatibilityError])
     }
   }
 
@@ -837,7 +837,7 @@ class BuildTests extends munit.FunSuite {
 
     inputs.withBuild(buildOptions, buildThreads, bloopConfig) { (_, _, maybeBuild) =>
       assert(maybeBuild.isRight)
-      val build     = maybeBuild.right.get
+      val build     = maybeBuild.toOption.get
       val artifacts = build.options.classPathOptions.extraDependencies.toSeq
       assert(artifacts.exists(_.value.toString() == cliDependency))
     }
@@ -870,7 +870,7 @@ class BuildTests extends munit.FunSuite {
 
     inputs.withBuild(buildOptions, buildThreads, bloopConfig) { (_, _, maybeBuild) =>
       assert(maybeBuild.isRight)
-      val build         = maybeBuild.right.get
+      val build         = maybeBuild.toOption.get
       val scalacOptions = build.options.scalaOptions.scalacOptions.toSeq.map(_.value.value)
       expect(scalacOptions == expectedOptions)
     }

modules/build/src/test/scala/scala/build/tests/PreprocessingTests.scala

@@ -17,7 +17,7 @@ class PreprocessingTests extends munit.FunSuite {
 
     assert(res.nonEmpty)
     assert(res.get.isLeft)
-    expect(res.get.left.get.message == expectedMessage)
+    expect(res.get.swap.toOption.get.message == expectedMessage)
   }
 
   test("Report error if scala script not exists") {
@@ -29,6 +29,6 @@ class PreprocessingTests extends munit.FunSuite {
 
     assert(res.nonEmpty)
     assert(res.get.isLeft)
-    expect(res.get.left.get.message == expectedMessage)
+    expect(res.get.swap.toOption.get.message == expectedMessage)
   }
 }