summaryrefslogtreecommitdiff
path: root/build-ant-macros.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-16 13:06:38 +1000
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-15 22:32:43 -0700
commita2973dfd954c0c094f956becb05a82bee5f7da01 (patch)
tree2135ee1616ff3920d00c35046be2037af9aa3a3f /build-ant-macros.xml
parentfa8012d28687986902ce1255a19f9f49affb3bca (diff)
downloadscala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.gz
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.bz2
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.zip
Remove further references to forkjoin
Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
Diffstat (limited to 'build-ant-macros.xml')
-rw-r--r--build-ant-macros.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml
index cfdb1ce70e..19429cdaa3 100644
--- a/build-ant-macros.xml
+++ b/build-ant-macros.xml
@@ -91,7 +91,6 @@
<macrodef name="simple-javac">
<attribute name="project"/>
- <!-- project: forkjoin -->
<attribute name="args" default=""/>
<attribute name="jar" default="yes"/>
<sequential>