aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz.driver.sbt/SbtSettings.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-09-01 11:07:04 -0700
committerJakob Odersky <jakob@driver.xyz>2017-09-01 11:07:04 -0700
commit240396dfe41385c81e476a1e5c5c3113b634c273 (patch)
tree328a6c5f42d1d312d9a419d556fdc45ce2fa60f7 /src/main/scala/xyz.driver.sbt/SbtSettings.scala
parent222ac99c305d7b12866546c7eae90c0e86c40ec3 (diff)
downloadsbt-settings-240396dfe41385c81e476a1e5c5c3113b634c273.tar.gz
sbt-settings-240396dfe41385c81e476a1e5c5c3113b634c273.tar.bz2
sbt-settings-240396dfe41385c81e476a1e5c5c3113b634c273.zip
Include test dependencies in integration tests
Diffstat (limited to 'src/main/scala/xyz.driver.sbt/SbtSettings.scala')
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index ca92f5f..380e985 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -244,15 +244,6 @@ object SbtSettings extends AutoPlugin {
)
}
- def integrationTestingConfiguration: Project = {
- project
- .configs(IntegrationTest)
- .settings(
- Defaults.itSettings ++ Seq(
- parallelExecution in IntegrationTest := false
- ))
- }
-
def packagingConfiguration: Project = {
project
.settings( // for assembly plugin
@@ -380,7 +371,7 @@ object SbtSettings extends AutoPlugin {
)
override def trigger: PluginTrigger = allRequirements
- override def projectSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq(
+ override def projectSettings: Seq[Setting[_]] = Seq(
organization := "xyz.driver",
crossScalaVersions := List("2.11.11", "2.12.3"),
scalaVersion := crossScalaVersions.value.head,