diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-02 03:21:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-02 03:21:42 -0400 |
commit | 2476e2ec1100813ae4e05cf2183feff8bf5ec8ea (patch) | |
tree | a334625acfe91c0233abf57a5fb7b52f040e0846 /plugins | |
parent | e7112d59b811ca4a0bda448a18e0c45cb4841abb (diff) | |
parent | c220ef8d12e77ce6af6fafde3b388fc3e334b380 (diff) | |
download | cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.gz cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.bz2 cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.zip |
Merge pull request #471 from cvogt/2.12-ready
2.12 ready
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/scalariform/build/build.scala | 6 | ||||
-rw-r--r-- | plugins/scalatest/ScalaTest.scala | 11 | ||||
-rw-r--r-- | plugins/scalatest/build/build.scala | 8 |
3 files changed, 1 insertions, 24 deletions
diff --git a/plugins/scalariform/build/build.scala b/plugins/scalariform/build/build.scala index 5910b41..80f3966 100644 --- a/plugins/scalariform/build/build.scala +++ b/plugins/scalariform/build/build.scala @@ -1,9 +1,5 @@ import cbt._ class Build(val context: Context) extends Plugin { - override def dependencies = - super.dependencies ++ - Resolver( mavenCentral ).bind( - ScalaDependency("org.scalariform", "scalariform", "0.1.8") - ) + override def dependencies = super.dependencies :+ ports.scalariform } diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala deleted file mode 100644 index 87ab16d..0000000 --- a/plugins/scalatest/ScalaTest.scala +++ /dev/null @@ -1,11 +0,0 @@ -package cbt -import java.io.File -trait ScalaTest extends BaseBuild{ - override def dependencies = super.dependencies :+ libraries.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 - } -} diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala deleted file mode 100644 index 4e94cd7..0000000 --- a/plugins/scalatest/build/build.scala +++ /dev/null @@ -1,8 +0,0 @@ -import cbt._ - -class Build(val context: Context) extends BaseBuild{ - override def dependencies = ( - super.dependencies - :+ context.cbtDependency - ) -} |