summaryrefslogtreecommitdiff
path: root/build.xml
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.xJason Zaugg2014-05-091-1/+1
|\|
| * Use 2.11.0 as the MiMa baseline for 2.11.xJason Zaugg2014-05-071-1/+1
* | Disable MiMa on the 2.12.x branchJason Zaugg2014-05-061-2/+3
|/
* IntelliJ project filesLukas Rytz2014-05-021-1/+2
* Another spot to fully cross version continuations pluginJason Zaugg2014-04-211-0/+1
* Render scala.full.version to versions.properties.Adriaan Moors2014-04-041-0/+2
* Remove distribution building from ant build, see scala/scala-dist.Adriaan Moors2014-03-031-177/+60
* No longer generate deprecated dists/maven/latest/build.xmlAdriaan Moors2014-03-031-33/+7
* Check library/reflect bincompat against 2.11.0-RC1Adriaan Moors2014-03-031-8/+3
* Update ant build's update.versions mechanism.Adriaan Moors2014-02-271-12/+22
* Revert "SI-7624 Fix -feature warnings in scala/tools/scalap"Grzegorz Kossakowski2014-02-261-0/+2
* Fix ./build/<stage>/bin/scaladocJason Zaugg2014-02-221-0/+1
* Merge pull request #3395 from adriaanm/dist-cleanupJason Zaugg2014-02-061-1/+1
|\
| * Scaladoc jars should go to /api.Adriaan Moors2014-01-211-1/+1
* | Merge pull request #3404 from gkossakowski/java8-supportGrzegorz Kossakowski2014-01-241-0/+4
|\ \
| * | Add support for Java 8 in our build.Grzegorz Kossakowski2014-01-211-0/+4
| |/
* | fix to partest.crossAntonio Cunei2014-01-221-2/+2
* | Add cross suffix customizability for modulesAntonio Cunei2014-01-221-7/+17
|/
* Merge pull request #3277 from adriaanm/scala-dist-mavenAdriaan Moors2014-01-091-114/+125
|\
| * Always copy man/* and doc/tools/*.Adriaan Moors2013-12-201-13/+14
| * scala-library-all: dependency for those who want it allAdriaan Moors2013-12-191-1/+7
| * scala-dist: all you need to roll your own scala distributionAdriaan Moors2013-12-191-14/+36
| * Prepare maven-based distribution building.Adriaan Moors2013-12-191-99/+85
| * Remove the unused test.continuations.suite.Adriaan Moors2013-12-181-4/+0
* | Invalidate <uptodate> checks on edits to build-ant-macros.xmlJason Zaugg2013-12-221-0/+2
* | Fix Ant uptodate checking in OSGI JAR creationJason Zaugg2013-12-221-24/+31
|/