summaryrefslogtreecommitdiff
path: root/build.sbt
Commit message (Expand)AuthorAgeFilesLines
* Bump baseVersion to 2.12.1 (#5389)Seth Tisue2016-11-011-1/+1
* Merge pull request #5379 from szeiger/wip/persist-buildcharacterStefan Zeiger2016-10-271-0/+15
|\
| * Store buildcharacter.properties in scala-compiler.jarStefan Zeiger2016-09-061-0/+15
* | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-181-8/+14
|\ \
| * | Make removing forkjoin dependant on the organization keyDale Wijnand2016-06-201-10/+14
* | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-181-0/+5
|\ \ \
| * | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-221-0/+5
| | |/ | |/|
* | | Avoid use of legacy JVM MaxPermSize option in partestJason Zaugg2016-10-181-1/+1
* | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-051-7/+7
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-041-1/+1
| |\ \ \
| | * | | Enable MiMa for 2.12.0Stefan Zeiger2016-09-291-1/+1
| * | | | Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-09-281-6/+6
| |\| | |
| | * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-271-1/+1
| | * | | Merge pull request #5414 from szeiger/wip/no-partest-in-packAdriaan Moors2016-09-261-4/+4
| | |\ \ \
| | | * | | Do not build partest-javaagent and partest-extras for `pack`Stefan Zeiger2016-09-221-4/+4
| | | |/ /
| | * / / Fixed reference to script engine factory in META-INF/servicesRaphael Jolly2016-09-161-1/+1
| | |/ /
* | | | Merge pull request #5413 from szeiger/wip/less-verbose-testAllLukas Rytz2016-09-301-8/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Make output of errors in testAll less verboseStefan Zeiger2016-09-211-8/+13
| |/ /
* / / Only compare group ID and artifact ID when looking for JLine JARStefan Zeiger2016-09-141-2/+8
|/ /
* | Merge pull request #5368 from retronym/ticket/SD-208Adriaan Moors2016-09-061-3/+12
|\ \
| * | Use STARR library for ManMakerJason Zaugg2016-08-311-2/+1
| * | Workaround sbt bug when partest itself throwsJason Zaugg2016-08-311-1/+11
* | | remove various references to Ant buildSeth Tisue2016-09-021-40/+14
* | | sbt build: fix "unchecked" warnings when compiling Java codeSeth Tisue2016-08-301-1/+1
|/ /
* | Decrease stack size for JUnit tests to 1M (same as the old ant build)Stefan Zeiger2016-08-291-1/+1
* | increase stack size when running JUnit testsSeth Tisue2016-08-261-0/+1
* | Switch remaining uses of ant over to sbtStefan Zeiger2016-08-231-6/+4
* | Split “partest run” off from “partest pos neg jvm”Stefan Zeiger2016-08-121-2/+4
* | Improve log output of the `testAll` taskStefan Zeiger2016-08-111-2/+42
* | Merge pull request #5292 from szeiger/wip/sbt-windowsAdriaan Moors2016-07-281-0/+27
|\ \
| * | Switch Windows CI build to sbt (w/ some sbt build improvements)Stefan Zeiger2016-07-211-0/+27
* | | Merge pull request #5299 from mpociecha/improve-intellij-integrationAdriaan Moors2016-07-261-1/+5
|\ \ \
| * | | Improve sbt-based IntelliJ integration in case of WindowsMichał Pociecha2016-07-221-1/+5
| |/ /
* / / SI-9560 Remove dependency on parser-combinators/jsonSimon Ochsenreither2016-07-221-4/+3
|/ /
* | Temporarily insource Scalacheck 1.11.6Jason Zaugg2016-06-271-2/+3
* | Fix test failures of the sbt build in 2.12.xLukas Rytz2016-06-231-12/+11
* | Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19Lukas Rytz2016-06-211-51/+128
|\|
| * Use sbt for PR validationStefan Zeiger2016-06-141-55/+132
* | Merge commit 'f775e1f' into merge-2.11-to-2.12-june-19Lukas Rytz2016-06-191-2/+2
|\|
| * Typo fixaf2016-06-101-2/+2
* | Remove experimental status from sbt build in load messageJanek Bogucki2016-06-041-3/+1
* | Merge commit '139f6bf' into merge-2.11-to-2.12-june-1Lukas Rytz2016-06-011-1/+4
|\|
| * Jarlist scala-library in build.sbtRaphael Jolly2016-05-211-1/+4
* | SI-9522 release key reference when deleting from OpenHashMapPerformant Data LLC2016-05-241-1/+2
* | Include missing web assets in scaladocscaladoc-include-assetsJakob Odersky2016-05-191-1/+1
* | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2016...Jason Zaugg2016-05-171-3/+7
|\|
| * Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-171-8/+12
| |\
| | * [backport] sbt build targets build/Adriaan Moors2016-05-171-5/+5
| | * Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-161-3/+7
* | | Merge commit 'd06ce96' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-111-21/+49
|\| |