Author: boisvert
Date: Sun Oct 3 16:53:06 2010
New Revision: 1003999
URL: http://svn.apache.org/viewvc?rev=1003999&view=rev
Log:
ScalaTestTask now deprecated in scalaTest 1.2; use ScalaTestAntTask instead
Modified:
buildr/trunk/lib/buildr/scala/tests.rb
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=1003999&r1=1003998&r2=1003999&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Sun Oct 3 16:53:06 2010
@@ -112,6 +112,8 @@ module Buildr::Scala
reportFile = File.join(reportDir, "TEST-#{suite}.txt")
taskdef =
Buildr.artifacts(self.class.dependencies).each(&:invoke).map(&:to_s)
Buildr.ant('scalatest') do |ant|
+ classname = (ScalaTest.version =~ /1\.[01]/) ? \
+ 'org.scalatest.tools.ScalaTestTask' :
'org.scalatest.tools.ScalaTestAntTask'
ant.taskdef :name=>'scalatest',
:classname=>'org.scalatest.tools.ScalaTestTask',
:classpath=>taskdef.join(File::PATH_SEPARATOR)
ant.scalatest :runpath=>dependencies.join(File::PATH_SEPARATOR) do