Issue #64 merge master #85
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…the respective latest ones. Update play-json version to latest minor 2.3.x version.
…cribed in the docs to coveralls.
Update versions of used libraries/plugins Fixes #67
implicit conversions for attributes and values
get on actual release of circe Closes #74
add maven central version badge to readme
circe 0.6.0
update readme for 0.6.0
Adding Object Links.
oporkka
commented
Feb 2, 2017
| @@ -2,12 +2,12 @@ import sbt._ | |||
|
|
|||
| object Dependencies { | |||
| // Versions | |||
| lazy val circeVersion = "0.5.0-M1" | |||
| lazy val akkaVersion = "2.4.7" | |||
| lazy val circeVersion = "0.7.0" | |||
There was a problem hiding this comment.
Updates moved from build.sbt of master branch, see https://github.com/zalando/scala-jsonapi/compare/8b0179a85d7b068d5ae17133b44b28a33c640660...master#diff-fdc3abdfd754eeb24090dbd90aeec2ceR15
|
Everything else was automatically merged, but the only conflict was in build.sbt. I had to specially update the dependencies in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge the development in the master branch to the submodule structure of issue #64