scalatest plugin now does not need import anymore

9 files changed, 3 insertions, 32 deletions

diff --git a/build/build.scala b/build/build.scala
index 0e7da30..c596245 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -24,6 +24,7 @@ class Build(val context: Context) extends Shared with Scalariform with PublishLo
     Seq(
       context.cbtHome / "stage2" / "DirectoryDependency.scala",
       context.cbtHome / "stage2" / "LazyDependency.scala",
+      context.cbtHome / "stage2" / "plugins" / "ScalaTest.scala",
       context.cbtHome / "stage2" / "libraries.scala",
       context.cbtHome / "stage2" / "plugins.scala",
       context.cbtHome / "stage2" / "ports.scala"
diff --git a/examples/scalatest-example/build/build/build.scala b/examples/scalatest-example/build/build/build.scala
index d641b51..c7b1b2b 100644
--- a/examples/scalatest-example/build/build/build.scala
+++ b/examples/scalatest-example/build/build/build.scala
@@ -2,7 +2,6 @@ import cbt._
 
 class Build(val context: Context) extends BuildBuild{
   override def dependencies = super.dependencies ++ Seq(
-    plugins.scalaTest,
     plugins.sbtLayout
   )
 }
diff --git a/libraries/eval/build/build/build.scala b/libraries/eval/build/build/build.scala
deleted file mode 100644
index af4eb64..0000000
--- a/libraries/eval/build/build/build.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import cbt._
-
-class Build(val context: Context) extends BuildBuild{
-  override def dependencies = super.dependencies :+ plugins.scalaTest
-}
diff --git a/plugins/scalatest/.gitignore b/plugins/scalatest/.gitignore
deleted file mode 100644
index 3cd6ea0..0000000
--- a/plugins/scalatest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src_generated/BuildInfo.scala
diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala
deleted file mode 100644
index 7e33ca2..0000000
--- a/plugins/scalatest/build/build.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-import cbt._
-
-class Build(val context: Context) extends GenerateBuildInfo{
-  def scalaTestVersion = "2.2.6"
-  override def dependencies = (
-    super.dependencies
-    :+ context.cbtDependency
-    ScalaDependency("org.scalatest","scalatest",scalaTestVersion)
-  )
-  override def buildInfo = super.buildInfo.copy(
-    s"""def scalaTestVersion = "$scalaTestVersion"""",
-    Some("cbt_plugins.scalaTest")
-  )
-}
diff --git a/ports/scalariform/build/build/build.scala b/ports/scalariform/build/build/build.scala
deleted file mode 100644
index d9eecf9..0000000
--- a/ports/scalariform/build/build/build.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package scalariform_build.build
-import cbt._
-class Build(val context: Context) extends BuildBuild{
-  override def dependencies = super.dependencies :+ plugins.scalaTest
-}
diff --git a/stage2/plugins.scala b/stage2/plugins.scala
index ec01d86..d82740f 100644
--- a/stage2/plugins.scala
+++ b/stage2/plugins.scala
@@ -16,7 +16,6 @@ class plugins( context: Context, scalaVersion: String ) {
   final lazy val scalaJs = plugin( "scalajs" )
   final lazy val scalapb = plugin( "scalapb" )
   final lazy val scalariform = plugin( "scalariform" )
-  final lazy val scalaTest = plugin( "scalatest" )
   final lazy val sonatypeRelease = plugin( "sonatype-release" )
   final lazy val uberJar = plugin( "uber-jar" )
   final lazy val wartremover = plugin( "wartremover" )
diff --git a/plugins/scalatest/ScalaTest.scala b/stage2/plugins/ScalaTest.scala
index dc67183..29a0777 100644
--- a/plugins/scalatest/ScalaTest.scala
+++ b/stage2/plugins/ScalaTest.scala
@@ -1,13 +1,11 @@
 package cbt
 import java.io.File
-trait ScalaTest extends BaseBuild{
-  override def dependencies = super.dependencies :+ libraries.scalatestRunner
+trait ScalaTest extends BaseBuild {
+  override def dependencies = super.dependencies :+ libraries.cbt.scalatestRunner
   override def run: ExitCode = {
     classLoader.loadClass( "cbt.scalatest.Runner" ).method(
       "run", classOf[Array[File]], classOf[ClassLoader]
     ).invoke( null, exportedClasspath.files.toArray, classLoader )
     ExitCode.Success
   }
-    ScalaDependency("org.scalatest","scalatest",cbt_plugins.scalaTest.BuildInfo.scalaTestVersion)
-  )
 }
diff --git a/test/test.scala b/test/test.scala
index f942375..0208637 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -254,7 +254,6 @@ object Main{
     compile("../plugins/scalafmt")
     compile("../plugins/scalajs")
     compile("../plugins/scalariform")
-    compile("../plugins/scalatest")
     compile("../plugins/wartremover")
     compile("../plugins/uber-jar")
     compile("../plugins/scalafix-compiler-plugin")