summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-14 16:35:40 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-14 16:53:56 -0800
commitc3f1b0d5c1f523146c718bf9fbb14594893af8e9 (patch)
tree58e02e5d8e42c2ca91812046fc9f3a8f4af09e16 /build.sbt
parent298d18bda6a9f6e795ac9b9e4c2eca50aa9118fe (diff)
downloadmill-c3f1b0d5c1f523146c718bf9fbb14594893af8e9.tar.gz
mill-c3f1b0d5c1f523146c718bf9fbb14594893af8e9.tar.bz2
mill-c3f1b0d5c1f523146c718bf9fbb14594893af8e9.zip
- Move synthetic SBT projects into `target` folder
- Update readme and `ci/` scripts to refer to new project layout - Remove stale `pprint.log`s
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt12
1 files changed, 7 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 8561c596..9a947800 100644
--- a/build.sbt
+++ b/build.sbt
@@ -30,9 +30,10 @@ val pluginSettings = Seq(
)
lazy val ammoniteRunner = project
- .in(file("synthetic/ammoniteRunner"))
+ .in(file("target/ammoniteRunner"))
.settings(
scalaVersion := "2.12.4",
+ target := baseDirectory.value,
libraryDependencies +=
"com.lihaoyi" % "ammonite" % "1.0.3-21-05b5d32" cross CrossVersion.full
)
@@ -55,11 +56,12 @@ def ammoniteRun(hole: SettingKey[File], args: String => List[String], suffix: St
def bridge(bridgeVersion: String) = Project(
id = "bridge" + bridgeVersion.replace('.', '_'),
- base = file("synthetic/bridge/" + bridgeVersion.replace('.', '_')),
+ base = file("target/bridge/" + bridgeVersion.replace('.', '_')),
settings = Seq(
organization := "com.lihaoyi",
scalaVersion := bridgeVersion,
name := "mill-bridge",
+ target := baseDirectory.value,
crossVersion := CrossVersion.full,
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
@@ -216,16 +218,16 @@ lazy val integration = project
)
lazy val bin = project
- .in(file("synthetic/bin"))
+ .in(file("target/bin"))
.dependsOn(scalalib, scalajslib)
.settings(
sharedSettings,
- baseDirectory := baseDirectory.value.getParentFile,
+ target := baseDirectory.value,
fork := true,
connectInput in (Test, run) := true,
outputStrategy in (Test, run) := Some(StdoutOutput),
mainClass in (Test, run) := Some("mill.Main"),
- baseDirectory in (Test, run) := (baseDirectory in (Compile, run)).value / "..",
+ baseDirectory in (Test, run) := (baseDirectory in (Compile, run)).value / ".." / "..",
assemblyOption in assembly := {
(assemblyOption in assembly).value.copy(
prependShellScript = Some(