Skip to content

Commit

Permalink
Move subprojects' settings into build.sbt
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikolay.Obedin authored and Nikolay.Obedin committed Jul 13, 2015
1 parent 026bb5b commit a9a8ce1
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 68 deletions.
3 changes: 0 additions & 3 deletions NailgunRunners/build.sbt

This file was deleted.

7 changes: 0 additions & 7 deletions Runners/build.sbt

This file was deleted.

5 changes: 0 additions & 5 deletions ScalaRunner/build.sbt

This file was deleted.

69 changes: 63 additions & 6 deletions build.sbt
Expand Up @@ -65,22 +65,45 @@ lazy val scalaCommunity =
.aggregate(jpsPlugin, sbtRuntimeDependencies, testDownloader)

lazy val jpsPlugin =
newProject("jpsPlugin", "jps-plugin")()
newProject("jpsPlugin", "jps-plugin")(
unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/sbt" * "*.jar").classpath,
unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/nailgun" * "*.jar").classpath,
unmanagedSourceDirectories in Compile += baseDirectory.value / "src",
unmanagedResourceDirectories in Compile += baseDirectory.value / "resources"
)
.settings(commonIdeaSettings:_*)
.dependsOn(compilerSettings)

lazy val compilerSettings =
newProject("compilerSettings", "compiler-settings")()
newProject("compilerSettings", "compiler-settings")(
unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/nailgun" * "*.jar").classpath,
unmanagedSourceDirectories in Compile += baseDirectory.value / "src"
)
.settings(commonIdeaSettings:_*)

lazy val scalaRunner =
newProject("scalaRunner", "ScalaRunner")()
newProject("scalaRunner", "ScalaRunner")(
unmanagedSourceDirectories in Compile += baseDirectory.value / "src",
unmanagedResourceDirectories in Compile += baseDirectory.value / "resources",
libraryDependencies += "org.specs2" %% "specs2" % "2.3.11" % "provided" excludeAll ExclusionRule(organization = "org.ow2.asm")
)

lazy val runners =
newProject("runners", "Runners")().dependsOn(scalaRunner)
newProject("runners", "Runners")(
unmanagedSourceDirectories in Compile += baseDirectory.value / "src",
libraryDependencies ++= Seq(
"org.specs2" %% "specs2" % "2.3.11" % "provided" excludeAll ExclusionRule(organization = "org.ow2.asm"),
"org.scalatest" % "scalatest_2.11" % "2.2.1" % "provided",
"com.lihaoyi" %% "utest" % "0.1.3" % "provided"
)
).dependsOn(scalaRunner)

lazy val nailgunRunners =
newProject("nailgunRunners", "NailgunRunners")().dependsOn(scalaRunner)
newProject("nailgunRunners", "NailgunRunners")(
unmanagedSourceDirectories in Compile += baseDirectory.value / "src",
unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/nailgun" * "*.jar").classpath
)
.dependsOn(scalaRunner)

lazy val ideaRunner =
newProject("ideaRunner", "idea-runner")(
Expand Down Expand Up @@ -114,7 +137,41 @@ lazy val sbtRuntimeDependencies =
)

lazy val testDownloader =
newProject("testJarsDownloader")()
newProject("testJarsDownloader")(
conflictWarning := ConflictWarning.disable,
resolvers ++= Seq(
"Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases",
"Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
),
libraryDependencies ++= Seq(
"org.scalatest" % "scalatest_2.11" % "2.2.1",
"org.scalatest" % "scalatest_2.10" % "2.2.1",
"org.specs2" % "specs2_2.11" % "2.4.15",
"org.scalaz" % "scalaz-core_2.11" % "7.1.0",
"org.scalaz" % "scalaz-concurrent_2.11" % "7.1.0",
"org.scala-lang.modules" % "scala-xml_2.11" % "1.0.2",
"org.specs2" % "specs2_2.10" % "2.4.6",
"org.scalaz" % "scalaz-core_2.10" % "7.1.0",
"org.scalaz" % "scalaz-concurrent_2.10" % "7.1.0",
"org.scalaz.stream" % "scalaz-stream_2.11" % "0.6a",
"com.chuusai" % "shapeless_2.11" % "2.0.0",
"org.typelevel" % "scodec-bits_2.11" % "1.1.0-SNAPSHOT",
"org.typelevel" % "scodec-core_2.11" % "1.7.0-SNAPSHOT",
"org.scalatest" % "scalatest_2.11" % "2.1.7",
"org.scalatest" % "scalatest_2.10" % "2.1.7",
"org.scalatest" % "scalatest_2.10" % "1.9.2",
"com.github.julien-truffaut" %% "monocle-core" % "1.2.0-SNAPSHOT",
"com.github.julien-truffaut" %% "monocle-generic" % "1.2.0-SNAPSHOT",
"com.github.julien-truffaut" %% "monocle-macro" % "1.2.0-SNAPSHOT",
"io.spray" %% "spray-routing" % "1.3.1"
),
dependencyOverrides ++= Set(
"org.scalatest" % "scalatest_2.10" % "2.1.7",
"org.scalatest" % "scalatest_2.11" % "2.1.7",
"org.scalatest" % "scalatest_2.10" % "1.9.2",
"com.chuusai" % "shapeless_2.11" % "2.0.0"
)
)

// packaging

Expand Down
3 changes: 0 additions & 3 deletions compiler-settings/build.sbt

This file was deleted.

7 changes: 0 additions & 7 deletions jps-plugin/build.sbt

This file was deleted.

37 changes: 0 additions & 37 deletions testJarsDownloader/build.sbt

This file was deleted.

0 comments on commit a9a8ce1

Please sign in to comment.