Merge pull request #143 from alexarchambault/remove-conf-file

Remove conf file

Author: alexarchambault

build.sc

@@ -156,7 +156,6 @@ class Build(val crossScalaVersion: String)
     Deps.nativeTools,
     Deps.osLib,
     Deps.pprint,
-    Deps.pureconfig,
     Deps.scalaJsEnvNodeJs,
     Deps.scalaJsLinkerInterface,
     Deps.scalaJsTestAdapter,

modules/build-macros/src/main/scala/scala/build/EitherAwait.scala renamed to modules/build-macros/src/main/scala/scala/build/EitherCps.scala

@@ -6,16 +6,16 @@ import scala.annotation.compileTimeOnly
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox
 
-object EitherAwait {
+object EitherCps {
   final case class Helper[E]() {
     def apply[T](body: T): Either[E, T] = macro impl
   }
   def either[E]: Helper[E] = Helper[E]()
-  @compileTimeOnly("[async] `value` must be enclosed in `optionally`")
+  @compileTimeOnly("[async] `value` must be enclosed in `EitherCps.either`")
   def value[E, T](option: Either[E, T]): T = ???
   def impl(c: blackbox.Context)(body: c.Tree): c.Tree = {
     import c.universe._
-    val awaitSym = typeOf[EitherAwait.type].decl(TermName("value"))
+    val awaitSym = typeOf[EitherCps.type].decl(TermName("value"))
     def mark(t: DefDef): Tree =
       c.internal.markForAsyncTransform(c.internal.enclosingOwner, t, awaitSym, Map.empty)
     val name = TypeName("stateMachine$async")

modules/build-macros/src/main/scala/scala/build/EitherTraverse.scala renamed to modules/build-macros/src/main/scala/scala/build/EitherSequence.scala

@@ -2,8 +2,8 @@ package scala.build
 
 import scala.collection.mutable.ListBuffer
 
-object EitherTraverse {
-  def traverse[E, T](eithers: Seq[Either[E, T]]): Either[::[E], Seq[T]] = {
+object EitherSequence {
+  def sequence[E, T](eithers: Seq[Either[E, T]]): Either[::[E], Seq[T]] = {
     val errors = new ListBuffer[E]
     val values = new ListBuffer[T]
     eithers.foreach {

modules/build-macros/src/main/scala/scala/build/Ops.scala

@@ -2,8 +2,17 @@ package scala.build
 
 object Ops {
   implicit class EitherSeqOps[E, T](private val seq: Seq[Either[E, T]]) extends AnyVal {
-    def traverse: Either[::[E], Seq[T]] =
-      EitherTraverse.traverse(seq)
+    def sequence: Either[::[E], Seq[T]] =
+      EitherSequence.sequence(seq)
+  }
+
+  implicit class EitherOptOps[E, T](private val opt: Option[Either[E, T]]) extends AnyVal {
+    def sequence: Either[E, Option[T]] =
+      opt match {
+        case None           => Right(None)
+        case Some(Left(e))  => Left(e)
+        case Some(Right(t)) => Right(Some(t))
+      }
   }
 
   implicit class EitherThrowOps[E <: Throwable, T](private val either: Either[E, T])
@@ -14,4 +23,22 @@ object Ops {
         case Right(t) => t
       }
   }
+
+  implicit class EitherMap3[Ex <: Throwable, ExA <: Ex, ExB <: Ex, ExC <: Ex, A, B, C](
+    private val eithers: (Either[ExA, A], Either[ExB, B], Either[ExC, C])
+  ) extends AnyVal {
+    def traverseN: Either[::[Ex], (A, B, C)] =
+      eithers match {
+        case (Right(a), Right(b), Right(c)) => Right((a, b, c))
+        case _ =>
+          val errors = eithers._1.left.toOption.toSeq ++
+            eithers._2.left.toOption.toSeq ++
+            eithers._3.left.toOption.toSeq
+          val errors0 = errors.toList match {
+            case Nil    => sys.error("Cannot happen")
+            case h :: t => ::(h, t)
+          }
+          Left(errors0)
+      }
+  }
 }

modules/build/src/main/scala/scala/build/Artifacts.scala

@@ -11,7 +11,7 @@ import dependency._
 import java.nio.file.Path
 
 import scala.build.errors.{BuildException, CompositeBuildException}
-import scala.build.EitherAwait.{either, value}
+import scala.build.EitherCps.{either, value}
 import scala.build.internal.Constants
 import scala.build.internal.Constants._
 import scala.build.internal.Util.ScalaDependencyOps
@@ -190,7 +190,7 @@ object Artifacts {
           artifacts(Seq(dep0), allExtraRepositories, params, logger)
             .map(_.map { case (url, path) => (dep0, url, path) })
         }
-        .traverse
+        .sequence
         .left.map(CompositeBuildException(_))
         .map(_.flatten)
     }

modules/build/src/main/scala/scala/build/Bloop.scala

@@ -8,7 +8,7 @@ import java.io.File
 import java.nio.file.Path
 
 import scala.build.blooprifle.BloopRifleConfig
-import scala.build.EitherAwait.{either, value}
+import scala.build.EitherCps.{either, value}
 import scala.build.errors.ModuleFormatError
 import scala.build.internal.Util.ScalaDependencyOps
 import scala.build.Ops._

modules/build/src/main/scala/scala/build/Build.scala

@@ -6,7 +6,7 @@ import com.swoval.files.FileTreeViews.Observer
 import com.swoval.files.{FileTreeRepositories, PathWatcher, PathWatchers}
 import dependency._
 import scala.build.blooprifle.BloopRifleConfig
-import scala.build.EitherAwait.{either, value}
+import scala.build.EitherCps.{either, value}
 import scala.build.errors.{BuildException, CompositeBuildException}
 import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
 import scala.build.Ops._
@@ -117,10 +117,12 @@ object Build {
     crossBuilds: Boolean
   ): Either[BuildException, (Build, Seq[Build])] = either {
 
-    val crossSources = CrossSources.forInputs(
-      inputs,
-      Sources.defaultPreprocessors(options.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper))
-    )
+    val crossSources = value {
+      CrossSources.forInputs(
+        inputs,
+        Sources.defaultPreprocessors(options.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper))
+      )
+    }
 
     val sources = crossSources.sources(options)
 
@@ -149,7 +151,7 @@ object Build {
       if (crossBuilds)
         value {
           options0.crossOptions.map(opt => doBuild(opt))
-            .traverse
+            .sequence
             .left.map(CompositeBuildException(_))
         }
       else
@@ -314,8 +316,7 @@ object Build {
               val isHidden    = relPath.segments.exists(_.startsWith("."))
               def isScalaFile = relPath.last.endsWith(".sc") || relPath.last.endsWith(".scala")
               def isJavaFile  = relPath.last.endsWith(".java")
-              def isConfFile  = relPath.last == "scala.conf" || relPath.last.endsWith(".scala.conf")
-              !isHidden && (isScalaFile || isJavaFile || isConfFile)
+              !isHidden && (isScalaFile || isJavaFile)
           case _ => _ => true
         }
 

modules/build/src/main/scala/scala/build/CrossSources.scala

@@ -1,8 +1,12 @@
 package scala.build
 
+import scala.build.EitherCps.{either, value}
+import scala.build.errors.BuildException
 import scala.build.internal.CodeWrapper
-import scala.build.options.{BuildOptions, BuildRequirements, HasBuildRequirements}
+import scala.build.Ops._
+import scala.build.options.{BuildOptions, BuildRequirements, HasBuildRequirements, Platform}
 import scala.build.preprocessing._
+import scala.build.errors.CompositeBuildException
 
 final case class CrossSources(
   paths: Seq[HasBuildRequirements[(os.Path, os.RelPath)]],
@@ -29,11 +33,11 @@ final case class CrossSources(
 
     val platform =
       if (buildOptionsWithScalaVersion.scalaJsOptions.enable)
-        BuildRequirements.Platform.JS
+        Platform.JS
       else if (buildOptionsWithScalaVersion.scalaNativeOptions.enable)
-        BuildRequirements.Platform.Native
+        Platform.Native
       else
-        BuildRequirements.Platform.JVM
+        Platform.JVM
 
     // FIXME Not 100% sure the way we compute the intermediate and final BuildOptions
     // is consistent (we successively filter out / retain options to compute a scala
@@ -66,11 +70,17 @@ object CrossSources {
   def forInputs(
     inputs: Inputs,
     preprocessors: Seq[Preprocessor]
-  ): CrossSources = {
+  ): Either[BuildException, CrossSources] = either {
 
-    val preprocessedSources = inputs.flattened().flatMap { elem =>
-      preprocessors.iterator.flatMap(p => p.preprocess(elem).iterator).toStream.headOption
-        .getOrElse(Nil) // FIXME Warn about unprocessed stuff?
+    val preprocessedSources = value {
+      inputs.flattened()
+        .map { elem =>
+          preprocessors.iterator.flatMap(p => p.preprocess(elem).iterator).toStream.headOption
+            .getOrElse(Right(Nil)) // FIXME Warn about unprocessed stuff?
+        }
+        .sequence
+        .left.map(CompositeBuildException(_))
+        .map(_.flatten)
     }
 
     val buildOptions = preprocessedSources.flatMap {
@@ -98,17 +108,19 @@ object CrossSources {
         Nil
     }
 
-    val mainClassOpt = inputs.mainClassElement
-      .collect {
-        case elem: Inputs.SingleElement =>
-          preprocessors.iterator
-            .flatMap(p => p.preprocess(elem).iterator)
-            .toStream.headOption
-            .getOrElse(Nil)
-            .flatMap(_.mainClassOpt.toSeq)
-            .headOption
-      }
-      .flatten
+    val mainClassOpt = value {
+      inputs.mainClassElement
+        .collect {
+          case elem: Inputs.SingleElement =>
+            preprocessors.iterator
+              .flatMap(p => p.preprocess(elem).iterator)
+              .toStream.headOption
+              .getOrElse(Right(Nil))
+              .map(_.flatMap(_.mainClassOpt.toSeq).headOption)
+        }
+        .sequence
+        .map(_.flatten)
+    }
 
     val paths = preprocessedSources.collect {
       case d: PreprocessedSource.OnDisk =>

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

@@ -2,13 +2,10 @@ package scala.build
 
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
 import java.math.BigInteger
-import java.net.URI
 import java.nio.charset.StandardCharsets
-import java.nio.file.{Files, Paths}
 import java.security.MessageDigest
 import java.util.zip.{ZipEntry, ZipInputStream}
 import scala.annotation.tailrec
-import scala.util.Properties
 import scala.util.matching.Regex
 
 final case class Inputs(
@@ -38,8 +35,6 @@ final case class Inputs(
               Inputs.ScalaFile(d.path, p.subRelativeTo(d.path))
             case p if p.last.endsWith(".sc") =>
               Inputs.Script(d.path, p.subRelativeTo(d.path))
-            case p if p.last == "scala.conf" || p.last.endsWith(".scala.conf") =>
-              Inputs.ConfigFile(p)
           }
           .toVector
       case _: Inputs.ResourceDirectory =>
@@ -77,8 +72,6 @@ final case class Inputs(
               Inputs.ScalaFile(d.path, p.subRelativeTo(d.path))
             case p if p.last.endsWith(".sc") =>
               Inputs.Script(d.path, p.subRelativeTo(d.path))
-            case p if p.last == "scala.conf" || p.last.endsWith(".scala.conf") =>
-              Inputs.ConfigFile(p)
           }
           .toVector
       case _: Inputs.ResourceDirectory =>
@@ -145,8 +138,6 @@ object Inputs {
   final case class Directory(path: os.Path)         extends OnDisk with Compiled
   final case class ResourceDirectory(path: os.Path) extends OnDisk
 
-  final case class ConfigFile(path: os.Path) extends SingleFile
-
   final case class VirtualScript(content: Array[Byte], source: String, wrapperPath: os.SubPath)
       extends Virtual with AnyScalaFile
   final case class VirtualScalaFile(content: Array[Byte], source: String)
@@ -164,7 +155,6 @@ object Inputs {
           case _: Inputs.JavaFile          => "java:"
           case _: Inputs.ScalaFile         => "scala:"
           case _: Inputs.Script            => "sc:"
-          case _: Inputs.ConfigFile        => "config:"
         }
         Iterator(prefix, elem.path.toString, "\n").map(bytes)
       case v: Inputs.Virtual =>
@@ -329,22 +319,8 @@ object Inputs {
     else
       forNonEmptyArgs(args, cwd, directories, baseProjectName, download, stdinOpt, acceptFds)
 
-  def default(cwd: os.Path = Os.pwd): Option[Inputs] = {
-    val hasConf = os.isFile(cwd / "scala.conf") ||
-      os.list(cwd).filter(os.isFile(_)).exists(_.last.endsWith(".scala.conf"))
-    if (hasConf)
-      Some {
-        Inputs(
-          Seq(Directory(cwd)),
-          mainClassElement = None,
-          workspace = cwd,
-          baseProjectName = "project",
-          mayAppendHash = true
-        )
-      }
-    else
-      None
-  }
+  def default(cwd: os.Path = Os.pwd): Option[Inputs] =
+    None
 
   def empty(workspace: os.Path): Inputs =
     Inputs(

modules/build/src/main/scala/scala/build/ReplArtifacts.scala

@@ -5,7 +5,7 @@ import java.nio.file.Path
 import dependency._
 
 import scala.build.errors.BuildException
-import scala.build.EitherAwait.{either, value}
+import scala.build.EitherCps.{either, value}
 
 final case class ReplArtifacts(
   replArtifacts: Seq[(String, Path)],