From 240396dfe41385c81e476a1e5c5c3113b634c273 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Fri, 1 Sep 2017 11:07:04 -0700 Subject: Include test dependencies in integration tests --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/main/scala/xyz.driver.sbt/SbtSettings.scala') 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, -- cgit v1.2.3