Skip to content

Commit

Permalink
Make every project use the new directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
smarter committed Nov 22, 2016
1 parent da1bfe3 commit c3eb841
Show file tree
Hide file tree
Showing 517 changed files with 11 additions and 5 deletions.
File renamed without changes.
16 changes: 11 additions & 5 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ object DottyBuild extends Build {

// set sources to src/, tests to test/ and resources to resources/
lazy val sourceStructure = Seq(
scalaSource in Compile := baseDirectory.value / "src",
scalaSource in Test := baseDirectory.value / "test",
javaSource in Compile := baseDirectory.value / "src",
javaSource in Test := baseDirectory.value / "test",
resourceDirectory in Compile := baseDirectory.value / "resources"
scalaSource in Compile := baseDirectory.value / "src",
scalaSource in Test := baseDirectory.value / "test",
javaSource in Compile := baseDirectory.value / "src",
javaSource in Test := baseDirectory.value / "test",
resourceDirectory in Compile := baseDirectory.value / "resources"
)


/** Projects -------------------------------------------------------------- */
// The root project:
// - aggregates other projects so that "compile", "test", etc are run on all projects at once.
Expand Down Expand Up @@ -117,6 +118,7 @@ object DottyBuild extends Build {


lazy val `dotty-interfaces` = project.in(file("interfaces")).
settings(sourceStructure).
settings(
// Do not append Scala versions to the generated artifacts
crossPaths := false,
Expand Down Expand Up @@ -364,6 +366,7 @@ object DottyBuild extends Build {

lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).
dependsOn(`dotty-compiler`).
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

Expand Down Expand Up @@ -409,6 +412,7 @@ object DottyBuild extends Build {
).
settings(ScriptedPlugin.scriptedSettings: _*).
settings(
ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
ScriptedPlugin.scriptedBufferLog := false
// TODO: Use this instead of manually copying DottyInjectedPlugin.scala
Expand Down Expand Up @@ -450,6 +454,7 @@ object DottyInjectedPlugin extends AutoPlugin {
*/
lazy val sjsSandbox = project.in(file("sandbox/scalajs")).
enablePlugins(ScalaJSPlugin).
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

Expand Down Expand Up @@ -484,6 +489,7 @@ object DottyInjectedPlugin extends AutoPlugin {

lazy val `dotty-bench` = project.in(file("bench")).
dependsOn(`dotty-compiler` % "compile->test").
settings(sourceStructure).
settings(
overrideScalaVersionSetting,

Expand Down
File renamed without changes.
Loading

0 comments on commit c3eb841

Please sign in to comment.