From a9a8ce1da3ecea844cf7c594b5621253201fddd4 Mon Sep 17 00:00:00 2001 From: "Nikolay.Obedin" Date: Wed, 24 Jun 2015 13:23:40 +0300 Subject: [PATCH] Move subprojects' settings into build.sbt --- NailgunRunners/build.sbt | 3 -- Runners/build.sbt | 7 ---- ScalaRunner/build.sbt | 5 --- build.sbt | 69 ++++++++++++++++++++++++++++++++---- compiler-settings/build.sbt | 3 -- jps-plugin/build.sbt | 7 ---- testJarsDownloader/build.sbt | 37 ------------------- 7 files changed, 63 insertions(+), 68 deletions(-) delete mode 100644 NailgunRunners/build.sbt delete mode 100644 Runners/build.sbt delete mode 100644 ScalaRunner/build.sbt delete mode 100644 compiler-settings/build.sbt delete mode 100644 jps-plugin/build.sbt delete mode 100644 testJarsDownloader/build.sbt diff --git a/NailgunRunners/build.sbt b/NailgunRunners/build.sbt deleted file mode 100644 index 4bf5494c819..00000000000 --- a/NailgunRunners/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -unmanagedSourceDirectories in Compile += baseDirectory.value / "src" - -unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/nailgun" * "*.jar").classpath \ No newline at end of file diff --git a/Runners/build.sbt b/Runners/build.sbt deleted file mode 100644 index 8ab7887c501..00000000000 --- a/Runners/build.sbt +++ /dev/null @@ -1,7 +0,0 @@ -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" -) \ No newline at end of file diff --git a/ScalaRunner/build.sbt b/ScalaRunner/build.sbt deleted file mode 100644 index 09ca2136926..00000000000 --- a/ScalaRunner/build.sbt +++ /dev/null @@ -1,5 +0,0 @@ -libraryDependencies += "org.specs2" %% "specs2" % "2.3.11" % "provided" excludeAll ExclusionRule(organization = "org.ow2.asm") - -unmanagedSourceDirectories in Compile += baseDirectory.value / "src" - -unmanagedResourceDirectories in Compile += baseDirectory.value / "resources" \ No newline at end of file diff --git a/build.sbt b/build.sbt index 63bdb9658bf..d5a9fdabca6 100644 --- a/build.sbt +++ b/build.sbt @@ -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")( @@ -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 diff --git a/compiler-settings/build.sbt b/compiler-settings/build.sbt deleted file mode 100644 index 5600572960f..00000000000 --- a/compiler-settings/build.sbt +++ /dev/null @@ -1,3 +0,0 @@ -unmanagedJars in Compile ++= (baseDirectory.value.getParentFile / "SDK/nailgun" * "*.jar").classpath - -unmanagedSourceDirectories in Compile += baseDirectory.value / "src" diff --git a/jps-plugin/build.sbt b/jps-plugin/build.sbt deleted file mode 100644 index eff77ed0ad9..00000000000 --- a/jps-plugin/build.sbt +++ /dev/null @@ -1,7 +0,0 @@ -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" diff --git a/testJarsDownloader/build.sbt b/testJarsDownloader/build.sbt deleted file mode 100644 index 2895fa8f96d..00000000000 --- a/testJarsDownloader/build.sbt +++ /dev/null @@ -1,37 +0,0 @@ -conflictWarning := ConflictWarning.disable - -resolvers += "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases" - -resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" - -libraryDependencies ++= Seq( - "org.scalatest" % "scalatest_2.11" % "2.2.1" % Compile, - "org.scalatest" % "scalatest_2.10" % "2.2.1" % Compile, - "org.specs2" % "specs2_2.11" % "2.4.15" % Compile, - "org.scalaz" % "scalaz-core_2.11" % "7.1.0" % Compile, - "org.scalaz" % "scalaz-concurrent_2.11" % "7.1.0" % Compile, - "org.scala-lang.modules" % "scala-xml_2.11" % "1.0.2" % Compile, - "org.specs2" % "specs2_2.10" % "2.4.6" % Compile, - "org.scalaz" % "scalaz-core_2.10" % "7.1.0" % Compile, - "org.scalaz" % "scalaz-concurrent_2.10" % "7.1.0" % Compile, - "org.scalaz.stream" % "scalaz-stream_2.11" % "0.6a" % Compile, - "com.chuusai" % "shapeless_2.11" % "2.0.0" % Compile, - "org.typelevel" % "scodec-bits_2.11" % "1.1.0-SNAPSHOT" % Compile, - "org.typelevel" % "scodec-core_2.11" % "1.7.0-SNAPSHOT" % Compile, - "org.scalatest" % "scalatest_2.11" % "2.1.7" % Compile, - "org.scalatest" % "scalatest_2.10" % "2.1.7" % Compile, - "org.scalatest" % "scalatest_2.10" % "1.9.2" % Compile, - "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" -) - -dependencyOverrides += "org.scalatest" % "scalatest_2.10" % "2.1.7" - -dependencyOverrides += "org.scalatest" % "scalatest_2.11" % "2.1.7" - -dependencyOverrides += "org.scalatest" % "scalatest_2.10" % "1.9.2" - -dependencyOverrides += "com.chuusai" % "shapeless_2.11" % "2.0.0" - -libraryDependencies += "io.spray" %% "spray-routing" % "1.3.1"