summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge commit 'fcc20fe' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-10/+11
|\|
| * Reuse the same compiler instance for all tests in a JUnit classLukas Rytz2015-03-111-0/+9
| * Correct dependency for test.junit.compAdriaan Moors2015-02-181-10/+2
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-01-291-3/+4
|\|
| * SI-8642 Enable OSGi tests under Java 8Jason Zaugg2015-01-281-1/+1
| * Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-281-2/+3
* | Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-291-14/+45
|\|
| * Merge pull request #4130 from mpociecha/let-specify-build-repos-homeGrzegorz Kossakowski2014-11-261-0/+2
| |\
| | * Let users specify a different location for build repos than user homempociecha2014-11-121-0/+2
| * | SI-8977 remove duplicate decoder.properties from scalapAntoine Gourlay2014-11-111-2/+1
| |/
| * SI-8927 Update OSGi stuff to get rid of bndlib warningRafał Krzewski2014-10-231-12/+42
* | Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-291-1/+1
|\|
| * Better ant / junit interactionAntoine Gourlay2014-09-291-1/+1
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2014...Jason Zaugg2014-09-171-5/+11
|\|
| * Merge pull request #3972 from lrytz/BCodeDelambdafyFixJason Zaugg2014-09-161-2/+7
| |\
| | * isAnonymousClass/Function for delambdafy classes is not trueLukas Rytz2014-09-121-2/+7
| * | JUnit tests for dead code elimination.Lukas Rytz2014-09-101-0/+1
| |/
* | Merge commit '47908f1' into merge/2.11-to-2.12-is-it-really-sept-2-already-wh...Lukas Rytz2014-09-021-1/+7
|\|
| * Add support for running a specific Junit test/method.Antoine Gourlay2014-08-251-1/+5
| * Also update jline.version when update.versions is set during buildLukas Rytz2014-07-221-0/+2
* | Merge commit '01f2d27' into merge/2.11-to-2.12-is-it-really-sept-2-already-wh...Lukas Rytz2014-09-021-2/+0
|\|
| * Bump jline version to 2.12 (Re: SI-8535)Adriaan Moors2014-07-151-2/+0
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.xJason Zaugg2014-06-101-14/+18
|\|
| * Disable OSGi tests under Java 8Jason Zaugg2014-06-041-14/+18
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 20:30:16 +0000