summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt20
1 files changed, 12 insertions, 8 deletions
diff --git a/build.sbt b/build.sbt
index 92dfffa9d5..984ac0e91c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,8 +4,8 @@
* What you see below is very much work-in-progress. The following features are implemented:
* - Compiling all classses for the compiler and library ("compile" in the respective subprojects)
* - Running JUnit tests ("test") and partest ("test/it:test")
- * - Creating build-sbt/quick with all compiled classes and launcher scripts ("dist/mkQuick")
- * - Creating build-sbt/pack with all JARs and launcher scripts ("dist/mkPack")
+ * - Creating build/quick with all compiled classes and launcher scripts ("dist/mkQuick")
+ * - Creating build/pack with all JARs and launcher scripts ("dist/mkPack")
* - Building all scaladoc sets ("doc")
* - Publishing ("publishDists" and standard sbt tasks like "publish" and "publishLocal")
*
@@ -212,7 +212,9 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings +
// Don't log process output (e.g. of forked `compiler/runMain ...Main`), just pass it
// directly to stdout
- outputStrategy in run := Some(StdoutOutput)
+ outputStrategy in run := Some(StdoutOutput),
+ Quiet.silenceScalaBinaryVersionWarning,
+ Quiet.silenceIvyUpdateInfoLogging
)
/** Extra post-processing for the published POM files. These are needed to create POMs that
@@ -503,6 +505,7 @@ lazy val replJlineEmbedded = Project("repl-jline-embedded", file(".") / "target"
JarJar(inputs, outdir, config)
}),
connectInput in run := true
+
)
.dependsOn(replJline)
@@ -705,8 +708,9 @@ lazy val root = (project in file("."))
.settings(
publish := {},
publishLocal := {},
- commands ++= ScriptCommands.all
- )
+ commands ++= ScriptCommands.all,
+ Quiet.silenceIvyUpdateInfoLogging
+)
.aggregate(library, forkjoin, reflect, compiler, interactive, repl, replJline, replJlineEmbedded,
scaladoc, scalap, actors, partestExtras, junit, libraryAll, scalaDist).settings(
sources in Compile := Seq.empty,
@@ -795,8 +799,8 @@ def configureAsForkOfJavaProject(project: Project): Project = {
lazy val buildDirectory = settingKey[File]("The directory where all build products go. By default ./build")
lazy val mkBin = taskKey[Seq[File]]("Generate shell script (bash or Windows batch).")
-lazy val mkQuick = taskKey[Unit]("Generate a full build, including scripts, in build-sbt/quick")
-lazy val mkPack = taskKey[Unit]("Generate a full build, including scripts, in build-sbt/pack")
+lazy val mkQuick = taskKey[Unit]("Generate a full build, including scripts, in build/quick")
+lazy val mkPack = taskKey[Unit]("Generate a full build, including scripts, in build/pack")
// Defining these settings is somewhat redundant as we also redefine settings that depend on them.
// However, IntelliJ's project import works better when these are set correctly.
@@ -855,7 +859,7 @@ def generateServiceProviderResources(services: (String, String)*): Setting[_] =
}
}.taskValue
-buildDirectory in ThisBuild := (baseDirectory in ThisBuild).value / "build-sbt"
+buildDirectory in ThisBuild := (baseDirectory in ThisBuild).value / "build"
// Add tab completion to partest
commands += Command("partest")(_ => PartestUtil.partestParser((baseDirectory in ThisBuild).value, (baseDirectory in ThisBuild).value / "test")) { (state, parsed) =>