summaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
* Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-1/+1
|\
| * bump copyright year to 2017Philippus Baalman2017-03-021-1/+1
* | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-1/+1
|\|
| * upgrade to MiMa 0.1.14Seth Tisue2017-02-141-1/+1
* | Merge pull request #5747 from dwijnand/fix-root-package-taskSeth Tisue2017-03-211-1/+2
|\ \
| * | Rewire package to osgiBundle for OSGi-enabled projectsDale Wijnand2017-03-151-1/+2
* | | remove test/pending directory tooSeth Tisue2017-03-211-1/+1
* | | fix typosSeth Tisue2017-03-201-1/+1
* | | new version numbers for snapshot and integration builds, new repositoryLukas Rytz2017-03-081-13/+20
* | | Get commit SHA and date with JGitStefan Zeiger2017-02-282-10/+33
* | | Add partest paths to the list of watched sources.Paul Phillips2017-02-261-0/+4
|/ /
* | Merge pull request #5732 from retronym/topic/build-info-malarkeyAdriaan Moors2017-02-241-0/+4
|\ \
| * | More predictable performance of SBT build startup, reloadJason Zaugg2017-02-231-0/+4
| |/
| * support --show-log for partest commandAdriaan Moors2017-01-091-1/+1
* | Merge pull request #5707 from retronym/topic/java9-prepareLukas Rytz2017-02-2012-0/+24
|\ \
| * | Workaround bug in Scala runtime reflection on JDK 9Jason Zaugg2017-02-1612-0/+24
* | | Merge pull request #5684 from SethTisue/partest-sbt-only-plzSeth Tisue2017-02-161-1/+1
|\ \ \ | |/ / |/| |
| * | fix annoying extra space in tab completion of sbt `partest` commandJason Zaugg2017-02-141-1/+1
* | | Make partest --grep glob paths, not just filenamesDale Wijnand2017-02-011-2/+2
|/ /
* | run ScalaCheck tests directly, not through partestSeth Tisue2017-01-271-1/+1
* | Fix how "sbt" is writtenDale Wijnand2016-12-214-4/+4
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-12-201-1/+1
|\|
| * Upgrade MiMa to 0.1.13Martynas Mickevičius2016-12-081-1/+1
* | Merge pull request #5558 from larsrh/topic/deprecated-y-flagsAdriaan Moors2016-12-131-1/+1
|\ \
| * | remove deprecated compiler flag "-Yinfer-by-name"Lars Hupel2016-12-011-1/+1
| * | remove deprecated compiler flag "-Yeta-expand-keeps-star"Lars Hupel2016-12-011-1/+1
* | | 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