summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Expand)AuthorAgeFilesLines
* Update sbt version to most recent releaseJanek Bogucki2016-03-171-2/+2
* Update sbt version to most recent that includes the compiler interfaceJanek Bogucki2016-03-091-1/+1
* Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-101-1/+1
|\
| * bump copyright year to 2016Seth Tisue2016-02-031-1/+1
* | Update partest to 1.0.12, test case for reporting invalid flagsLukas Rytz2016-02-031-0/+2
* | add new look to scaladocFelix Mulder2015-12-221-0/+8
* | Upgrade JarJar in the ant buildStefan Zeiger2015-11-271-2/+2
* | Merge commit '8eb1d4c' into merge-2.11-to-2.12-nov-24Lukas Rytz2015-11-241-9/+4
|\|
| * Merge pull request #4853 from SethTisue/mima-upgradeLukas Rytz2015-11-231-1/+1
| |\
| | * upgrade to MiMa 0.1.8Seth Tisue2015-11-191-1/+1
| * | Build scaladoc sets from sbtStefan Zeiger2015-11-051-8/+3
| |/
* | Merge commit '03aaf05' into merge-2.11-to-2.12-sep-22Lukas Rytz2015-09-221-1/+2
|\|
| * Merge remote-tracking branch 'origin/2.11.x' into topic/completely-2.11Jason Zaugg2015-09-171-0/+5
| |\
| * | REPL depends on presentation compilerJason Zaugg2015-09-021-1/+2
* | | Merge commit 'a170c99' into 2.12.xLukas Rytz2015-09-221-0/+5
|\ \ \ | | |/ | |/|
| * | Abort Ant build if Ant version is <1.9Simon Schäfer2015-09-161-0/+5
| * | unset inappropriate execute bitsSeth Tisue2015-09-021-0/+0
| |/
* | Merge branch '2.11.x' into 2.12.xAdriaan Moors2015-08-051-1/+1
|\|
| * Include jline on quick.bin tool pathAdriaan Moors2015-08-041-1/+1
* | Merge commit '4c6dcfe934' into 2.12.xAdriaan Moors2015-08-051-1/+1
|\|
| * bump copyright year to 2015Seth Tisue2015-07-171-1/+1
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-07-231-1/+1
|\|
| * SI-8744 fix version.number in scaladoc.propertiesSeth Tisue2015-07-131-1/+1
* | Remove our fork of forkjoin. Java 8 bundles it.Adriaan Moors2015-07-151-15/+3
* | Enable the new optimizer when building scalaLukas Rytz2015-07-031-4/+4
* | Include sources for scala-java8-compat instead of jarLukas Rytz2015-07-011-38/+0
* | Prepare build for inclusion of java8-compatLukas Rytz2015-07-011-19/+24
* | Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624Jason Zaugg2015-06-241-3/+39
|\|
| * SI-9339 Support classpaths with no single compatible jlineAdriaan Moors2015-06-181-2/+38
| * Update to scala-java8-compat 0.5.0Jason Zaugg2015-05-221-1/+1
| * Merge pull request #4497 from retronym/topic/indylambda-diy-boxingJason Zaugg2015-05-161-1/+1
| |\
| | * Update to scala-java8-compat 0.4.0Jason Zaugg2015-05-111-1/+1
* | | Require and target Java 8Jason Zaugg2015-05-261-9/+1
* | | Compile & run partest-extras using quick libraryAdriaan Moors2015-05-181-1/+11
* | | Merge commit '297eeb3' into merge-2.11-may-12Lukas Rytz2015-05-121-11/+13
|\| |
| * | Merge pull request #4499 from lrytz/removeAsmLukas Rytz2015-05-121-11/+13
| |\ \ | | |/ | |/|
| | * Include ASM as a dependency in ANT buildLukas Rytz2015-05-111-11/+13
| * | [backport] remove references to private-repo.typesafe.comLukas Rytz2015-05-061-2/+2
| |/
* | Merge commit '1b7e660' into merge-2.11-may-12Lukas Rytz2015-05-121-0/+38
|\|
| * Merge pull request #4463 from retronym/topic/indylambda-emit-indyLukas Rytz2015-05-041-0/+38
| |\
| | * Add scala-java8-compat to scala-library.jarJason Zaugg2015-04-211-0/+38
* | | Merge pull request #4480 from retronym/merge/2.11.x-to-2.12.x-20150501Lukas Rytz2015-05-011-4/+4
|\ \ \
| * | | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-05-011-4/+4
| |\| |
| | * | Align how ant builds asm & forkjoinGrzegorz Kossakowski2015-04-171-4/+4
| | |/
* | | Remove akka-actor from scala-library-allLukas Rytz2015-04-301-2/+0
* | | remove references to private-repo.typesafe.comLukas Rytz2015-04-301-2/+2
|/ /
* | Remove scala.actors and the actors migration module dependencyLukas Rytz2015-04-231-46/+7
* | Remove the continuations plugin module dependencyLukas Rytz2015-04-231-32/+3
* | Merge commit '32f520f' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-0/+1
|\|
| * SI-9038 fix scaladoc syntax highlightning to leave unicode aloneAntoine Gourlay2015-03-261-0/+1