aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-03-29 10:11:14 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2017-04-02 02:43:39 -0400
commita09c94e411e28192658eb3f3fbdb7ca223f66709 (patch)
treebf4e05bab7c9a78c734410d414efc0fd7ca2d2f2 /plugins
parent2d73091740528b423259c6190b3ae344a419978a (diff)
downloadcbt-a09c94e411e28192658eb3f3fbdb7ca223f66709.tar.gz
cbt-a09c94e411e28192658eb3f3fbdb7ca223f66709.tar.bz2
cbt-a09c94e411e28192658eb3f3fbdb7ca223f66709.zip
upgrade scalatest plugin to scalatest 2.2.6 and use buildinfo to avoid
version duplication
Diffstat (limited to 'plugins')
-rw-r--r--plugins/scalatest/.gitignore1
-rw-r--r--plugins/scalatest/ScalaTest.scala2
-rw-r--r--plugins/scalatest/build/build.scala8
3 files changed, 10 insertions, 1 deletions
diff --git a/plugins/scalatest/.gitignore b/plugins/scalatest/.gitignore
new file mode 100644
index 0000000..3cd6ea0
--- /dev/null
+++ b/plugins/scalatest/.gitignore
@@ -0,0 +1 @@
+src_generated/BuildInfo.scala
diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala
index 87ab16d..dc67183 100644
--- a/plugins/scalatest/ScalaTest.scala
+++ b/plugins/scalatest/ScalaTest.scala
@@ -8,4 +8,6 @@ trait ScalaTest extends BaseBuild{
).invoke( null, exportedClasspath.files.toArray, classLoader )
ExitCode.Success
}
+ ScalaDependency("org.scalatest","scalatest",cbt_plugins.scalaTest.BuildInfo.scalaTestVersion)
+ )
}
diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala
index 4e94cd7..7e33ca2 100644
--- a/plugins/scalatest/build/build.scala
+++ b/plugins/scalatest/build/build.scala
@@ -1,8 +1,14 @@
import cbt._
-class Build(val context: Context) extends BaseBuild{
+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")
)
}