summaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.11.x' into merge-2.11.x-to-2.12.x-dec-1Seth Tisue2016-12-011-1/+1
|\
| * upgrade MiMa to 0.1.12Seth Tisue2016-12-011-1/+1
| * Merge pull request #5464 from retronym/backport/5386Seth Tisue2016-10-191-1/+1
| |\
| | * [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-191-1/+1
| * | SI-2712 Add support for higher order unificationMiles Sabin2016-08-151-1/+1
| |/
* | Workaround a bug that rendered MiMa inoperativeJason Zaugg2016-11-161-2/+6
* | Merge pull request #5497 from szeiger/wip/sd-254Jason Zaugg2016-11-111-4/+9
|\ \
| * | Don’t include scala-asm.jar in scala-compiler.jarStefan Zeiger2016-11-101-4/+9
* | | Merge pull request #5432 from dwijnand/partest-scalac_optsAdriaan Moors2016-11-101-1/+4
|\ \ \ | |/ / |/| |
| * | Add support for -Dpartest.scalac_opts to the partest commandDale Wijnand2016-09-291-1/+4
* | | Avoid 2 more deprecated sbt 0.12 operatorsDale Wijnand2016-11-041-1/+1
* | | avoid deprecated sbt 0.12 operatorsSeth Tisue2016-11-041-2/+2
* | | upgrade to sbt 0.13.13Seth Tisue2016-10-281-1/+1
* | | Merge pull request #5379 from szeiger/wip/persist-buildcharacterStefan Zeiger2016-10-271-3/+6
|\ \ \
| * | | Store buildcharacter.properties in scala-compiler.jarStefan Zeiger2016-09-061-3/+6
| |/ /
* | | assorted typo fixes, cleanup, updating of commentsSeth Tisue2016-10-241-1/+1
* | | dogfood the new MiMaSeth Tisue2016-10-191-1/+1
* | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-181-1/+1
|\ \ \
| * | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-221-1/+1
| |/ /
* | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-052-2/+2
|\ \ \
| * | | Enable MiMa for 2.12.0Stefan Zeiger2016-09-291-1/+1
| * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-271-1/+1
| |/ /
* / / use proper lightbend.com and scala-sbt.org URLsSeth Tisue2016-09-281-1/+1
|/ /
* | remove various references to Ant buildSeth Tisue2016-09-024-9/+6
* | Fields does bitmaps & synch for lazy vals & modulesAdriaan Moors2016-08-291-1/+1
* | Switch remaining uses of ant over to sbtStefan Zeiger2016-08-231-19/+26
* | Merge pull request #5292 from szeiger/wip/sbt-windowsAdriaan Moors2016-07-282-32/+28
|\ \
| * | Switch Windows CI build to sbt (w/ some sbt build improvements)Stefan Zeiger2016-07-212-32/+28
* | | Improve sbt-based IntelliJ integration in case of WindowsMichał Pociecha2016-07-221-2/+2
|/ /
* | Switch the bootstrap build over to sbtStefan Zeiger2016-07-153-21/+107
* | Use 2.12.0-M4-9901daf as STARR (see #5152)Adriaan Moors2016-06-281-1/+1
* | Fix test failures of the sbt build in 2.12.xLukas Rytz2016-06-231-0/+1
* | Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19Lukas Rytz2016-06-218-17/+167
|\|
| * Remove bnd warnings from log outputStefan Zeiger2016-06-141-1/+1
| * Use sbt for PR validationStefan Zeiger2016-06-148-17/+167
* | Merge commit '139f6bf' into merge-2.11-to-2.12-june-1Lukas Rytz2016-06-011-2/+11
|\|
| * Jarlist scala-library in build.sbtRaphael Jolly2016-05-211-2/+11
* | Merge pull request #5102 from milessabin/2.12.xJason Zaugg2016-05-271-1/+1
|\ \
| * | SI-2712 Add support for higher order unificationMiles Sabin2016-05-241-1/+1
* | | Rename -Yopt to -opt, -Yopt-warnings to -opt-warningsLukas Rytz2016-05-251-1/+1
|/ /
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-05-172-1/+34
|\|
| * Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-172-1/+34
| |\
| | * Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-162-1/+34
* | | Merge commit 'd06ce96' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-111-1/+0
|\| |
| * | Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-111-1/+0
| |\ \ | | |/ | |/|
| | * Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-061-1/+0
* | | SI-9684 Deprecate JavaConversionsSom Snytt2016-04-221-4/+4
* | | SI-6710 / PR 5072 follow-up: fix Unit.box / Unit.unboxLukas Rytz2016-04-201-4/+8
* | | Generate AnyVal source stubs from sbtStefan Zeiger2016-04-061-0/+486
* | | Merge pull request #5021 from szeiger/wip/remove-deprecationsSeth Tisue2016-03-291-0/+2
|\ \ \