summaryrefslogtreecommitdiff
path: root/src/intellij/test-junit.iml.SAMPLE
Commit message (Collapse)AuthorAgeFilesLines
* Remove further references to forkjoinJason Zaugg2015-07-151-1/+0
| | | | | | | | | | | | | | | | | 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.
* Merge commit '1b7e660' into merge-2.11-may-12Lukas Rytz2015-05-121-14/+7
|\
| * Update intellij project files for IDEA 14.1 and latest Scala pluginLukas Rytz2015-05-011-13/+6
| | | | | | | | | | Removes the src/intellij-14 folder and moves everything back to src/intellij.
* | Remove scala.actors and the actors migration module dependencyLukas Rytz2015-04-231-1/+0
|/
* IntelliJ project filesLukas Rytz2014-05-021-0/+30
Fixes compilation within IDEA. Allows compiling and running JUnit tests directly withing the IDE.