summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add more depscross-build-bincompatJohannes Rudolph2019-07-261-4/+1
* don't run third-party scriptsJohannes Rudolph2019-07-261-2/+3
* Merge remote-tracking branch 'origin/master' into HEADJohannes Rudolph2019-07-263-8/+5
|\
| * Merge pull request #290 from pjfanning/patch-1Johannes Rudolph2019-07-231-1/+1
| |\
| | * update release date in changelogPJ Fanning2018-12-291-1/+1
| * | Update scala 2.13.0-RC3 to 2.13.0 (#299)Philippus Baalman2019-07-082-4/+6
* | | Add support for ScalaJS and Scala NativeJakob Odersky2019-06-1040-159/+336
|/ /
* | Update scala 2.13.0-RC2 to 2.13.0-RC3 (#298)Philippus Baalman2019-05-312-2/+2
* | Update to 2.13.0-RC2 (#296)Arnout Engelen2019-05-222-2/+2
* | Update scala 2.13.0-M5 to 2.13.0-RC1 (#294)Philippus Baalman2019-04-158-17/+17
|/
* Add note about changed field order to CHANGELOGJohannes Rudolph2018-11-091-0/+3
* Bump version in README to 1.3.5Johannes Rudolph2018-11-081-1/+1
* Next versionJohannes Rudolph2018-11-081-1/+1
* Add 1.3.5 release notesv1.3.5Johannes Rudolph2018-11-081-0/+29
* Add documentation for JsonParserSettingsJohannes Rudolph2018-11-081-1/+15
* Seal JsonParserSetting traitJohannes Rudolph2018-11-081-1/+17
* Bump version to 1.3.5Johannes Rudolph2018-11-081-1/+1
* Merge pull request #283 from jrudolph/limit-size-of-numbersJohannes Rudolph2018-11-083-5/+35
|\
| * CVE-2018-18853 Limit the number of characters for numbers in the parser, fixe...Johannes Rudolph2018-11-073-5/+35
|/
* Merge pull request #284 from jrudolph/fix-uncontrolled-recursionJohannes Rudolph2018-11-073-19/+68
|\
| * CVE-2018-18855 Fix uncontrolled recursion in the JsonParser by imposing a con...Johannes Rudolph2018-11-073-19/+68
* | Merge pull request #285 from spray/jrudolph-patch-1Johannes Rudolph2018-11-071-2/+15
|\ \
| * | Travis: add workspace caching (ivy/sbt)Johannes Rudolph2018-11-071-2/+15
* | | Merge pull request #280 from jrudolph/use-TreeMap-fixes-277Johannes Rudolph2018-11-075-13/+76
|\ \ \ | |/ / |/| |
| * | CVE-2018-18854 Use TreeMap instead of HashMap for JsObject key/value pairs, f...Johannes Rudolph2018-11-075-13/+76
* | | Merge pull request #282 from jrudolph/introduce-JsonParserSettingsJohannes Rudolph2018-11-073-2/+16
|\ \ \ | | |/ | |/|
| * | Introduce JsonParserSettings to allow customization of parsingJohannes Rudolph2018-10-303-2/+16
|/ /
* | Merge pull request #274 from xuwei-k/jdk11Johannes Rudolph2018-10-231-0/+4
|\ \
| * | add jdk11 testxuwei-k2018-10-231-0/+4
| |/
* | sbt 1.2.6 (#276)kenji yoshida2018-10-231-1/+1
* | Merge pull request #279 from jrudolph/update-to-scala-2.12.7Johannes Rudolph2018-10-232-2/+2
|\ \ | |/ |/|
| * Update to Scala 2.12.7Johannes Rudolph2018-10-232-2/+2
|/
* Merge pull request #275 from xuwei-k/Scala-2.13.0-M5v1.3.4-2.13.0-M5Johannes Rudolph2018-10-232-4/+4
|\
| * Scala 2.13.0-M5xuwei-k2018-10-142-4/+4
|/
* Add support for Scala 2.13.0-M4 (#263)v1.3.4-2.13.0-M4kenji yoshida2018-08-079-17/+26
* Merge pull request #269 from jrudolph/update-dependenciesJohannes Rudolph2018-08-074-27/+8
|\
| * Remove 2.13.0-M3 support for nowJohannes Rudolph2018-08-072-10/+1
| * Cleanup buildJohannes Rudolph2018-08-071-8/+0
| * Build with 2.12 by defaultJohannes Rudolph2018-08-071-3/+1
| * Upgrade dependency versionsJohannes Rudolph2018-08-073-7/+7
|/
* Merge pull request #272 from nikhilpatil/patch-1Johannes Rudolph2018-08-021-4/+4
|\
| * Update README.markdownNikhil2018-08-011-4/+4
|/
* Merge pull request #219 from magnolia-k/fix_warnings_about_manifestJohannes Rudolph2018-07-263-6/+11
|\
| * Use classTag[T] instead of implicitly[ClassTag[T]]Johannes Rudolph2018-07-261-3/+2
| * Replace ClassManifest to ClassTagMagnolia K2017-01-223-6/+12
* | Merge pull request #266 from jrudolph/check-mima-against-more-than-one-versionKonrad `ktoso` Malawski2018-07-132-2/+5
|\ \
| * | Update to sbt 1.1.6Johannes Rudolph2018-07-131-1/+1
| * | Check mima against a few released versionsJohannes Rudolph2018-07-131-1/+4
|/ /
* | Merge pull request #258 from xuwei-k/Scala-2.12.6Johannes Rudolph2018-07-102-2/+2
|\ \
| * | Scala 2.12.6xuwei-k2018-05-102-2/+2