Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5501 from SethTisue/sbt-deprecations | Jason Zaugg | 2016-11-10 | 2 | -66/+73 |
|\ | |||||
| * | sbt build: omit `: _*` when calling `.settings` | Seth Tisue | 2016-11-08 | 1 | -51/+51 |
| * | Don’t rely on deprecated ScalaInstance methods | Stefan Zeiger | 2016-11-07 | 1 | -2/+6 |
| * | Avoid 2 more deprecated sbt 0.12 operators | Dale Wijnand | 2016-11-04 | 2 | -2/+2 |
| * | avoid deprecated sbt 0.12 operators | Seth Tisue | 2016-11-04 | 2 | -11/+14 |
* | | Merge pull request #5507 from viktorklang/wip-SI-10034-√ | Jason Zaugg | 2016-11-10 | 2 | -2/+2 |
|\ \ | |||||
| * | | Regression: Make Future.failed(e).failed turn into a success instead of failure | Viktor Klang | 2016-11-08 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #5510 from retronym/merge/2.11.x-to-2.12.x-20161108 | Lukas Rytz | 2016-11-08 | 3 | -13/+20 |
|\ \ | |/ |/| | |||||
| * | Merge commit 'fe47ef0' into 2.12.x | Jason Zaugg | 2016-11-08 | 1 | -0/+4 |
| |\ | |||||
| | * | Merge pull request #5504 from retronym/topic/sbt-macro-warn | Seth Tisue | 2016-11-07 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Silence SBT logging about macros and incremental compilation. | Jason Zaugg | 2016-11-07 | 1 | -0/+4 |
| * | | | Merge commit '2f2f0f7' into 2.12.x | Jason Zaugg | 2016-11-08 | 0 | -0/+0 |
| |\| | | |||||
| | * | | Merge pull request #5478 from dragos/backport/remove-println-SI-8717 | Adriaan Moors | 2016-10-28 | 3 | -6/+4 |
| | |\ \ | |||||
| | | * | | [backport] Replace println with log calls in BrowsingLoaders | Iulian Dragos | 2016-10-25 | 3 | -6/+4 |
| * | | | | Merge commit 'b9a16c4' into 2.12.x | Jason Zaugg | 2016-11-08 | 2 | -13/+16 |
|/| | | | | |/ / / | |||||
| * | | | Merge pull request #5378 from som-snytt/issue/9913 | Seth Tisue | 2016-10-26 | 2 | -13/+16 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | SI-9913 Tighten bolts on span iterator | Som Snytt | 2016-09-06 | 1 | -13/+10 |
| | * | | SI-9913 Lead span iterator finishes at state -1 | Som Snytt | 2016-09-05 | 2 | -1/+7 |
* | | | | Merge pull request #5469 from adriaanm/java-scan-tailrec | Adriaan Moors | 2016-11-04 | 6 | -104/+88 |
|\ \ \ \ | |||||
| * | | | | Add regression tests for SI-10027 | Jakob Odersky | 2016-11-03 | 3 | -0/+18 |
| * | | | | Factor out some more into ScaladocScanner | Adriaan Moors | 2016-10-19 | 2 | -30/+26 |
| * | | | | DocScanner has doc-comment scanning hooks. | Adriaan Moors | 2016-10-19 | 3 | -67/+46 |
| * | | | | Keep `skipBlockComment` tail recursive | Adriaan Moors | 2016-10-19 | 2 | -39/+30 |
* | | | | | Merge pull request #5499 from xuwei-k/patch-1 | Adriaan Moors | 2016-11-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix starr version in README.md | kenji yoshida | 2016-11-04 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #5496 from adriaanm/2.12.x | Seth Tisue | 2016-11-03 | 18 | -3656/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Temporarily insource Scalacheck 1.11.6" | Adriaan Moors | 2016-11-01 | 18 | -3652/+5 |
| * | | | | | Use 2.12.0 for STARR | Adriaan Moors | 2016-11-01 | 1 | -1/+1 |
| * | | | | | Merge 2.12.0 into 2.12.x | Adriaan Moors | 2016-11-01 | 1 | -3/+6 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #5470 from adriaanm/2.12.0-RC2 | Seth Tisue | 2016-10-20 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bump to 2.12.0-RC2 starr and modules | Adriaan Moors | 2016-10-19 | 1 | -2/+2 |
| | |/ / / / / | |||||
| | * | | | | | Drop repo_ref from jenkins.properties | Adriaan Moors | 2016-10-14 | 1 | -2/+0 |
* | | | | | | | Merge pull request #5488 from SethTisue/sbt-0.13.13 | Seth Tisue | 2016-11-02 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | upgrade to sbt 0.13.13 | Seth Tisue | 2016-10-28 | 2 | -2/+2 |
* | | | | | | | Bump baseVersion to 2.12.1 (#5389) | Seth Tisue | 2016-11-01 | 3 | -5/+3 |
* | | | | | | | Merge pull request #5492 from thefourtheye/patch-1 | Lukas Rytz | 2016-11-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: minor grammatical fix | Sakthipriyan Vairamani | 2016-11-01 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #5493 from thefourtheye/patch-2 | Adriaan Moors | 2016-10-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | doc: fix README link | Sakthipriyan Vairamani | 2016-11-01 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5410 from SethTisue/scala-xml-1.0.6 | Adriaan Moors | 2016-10-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | upgrade to scala-xml 1.0.6 | Seth Tisue | 2016-09-19 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #5373 from TimWSpence/2.12.x | Seth Tisue | 2016-10-31 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-9909: corrected stream example so it does not give forward reference | Tim Spence | 2016-10-21 | 1 | -3/+3 |
* | | | | | | | | | Merge pull request #5482 from lrytz/sd248-frontend | Lukas Rytz | 2016-10-28 | 23 | -190/+233 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Address review comments | Lukas Rytz | 2016-10-28 | 5 | -40/+41 |
| * | | | | | | | | For scala classfiles, only parse the scala signature annotation | Lukas Rytz | 2016-10-28 | 11 | -24/+76 |
| * | | | | | | | | SI-7139 test case, fixed by one of the recent commits | Lukas Rytz | 2016-10-27 | 3 | -0/+28 |
| * | | | | | | | | Minor style cleanups, no changes in logic | Lukas Rytz | 2016-10-27 | 4 | -35/+11 |
| * | | | | | | | | Robustly identify unpickling the current module class | Lukas Rytz | 2016-10-27 | 1 | -11/+11 |
| * | | | | | | | | Classfile parser and unpickler require class and module symbol arguments | Lukas Rytz | 2016-10-27 | 3 | -32/+34 |