Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CPP MIN_VERSION_* checks #109

Merged
merged 2 commits into from Jun 16, 2017

Conversation

@ghost
Copy link

commented Jun 15, 2017

These changes remove MIN_VERSION_conduit() checks that will always be true, in order to remove clutter, and add MIN_VERSION_aeson() checks, in order to resolve deprecation warnings (and prevent unpleasant surprises with future aeson versions).

These changes should affect neither the interface nor the behaviour of this library.

Stijn van Drongelen added 2 commits Jun 15, 2017
Stijn van Drongelen
Remove tautological CPP blocks regarding conduit versions
These changes should affect neither the interface nor the behaviour
of this library.

dee4776 introduced compatibility with
conduit 1.0, while retaining compatibility with pre-1.0 conduit.
Because yaml has required conduit 1.0+ since
932a36a, these version checks are
no longer necessary.

aa154a5 introduced compatibility with
conduit 1.1, while retaining compatibility with pre-1.1 conduit.
Because yaml has required conduit 1.1+ since
fe4ef27, these version checks are
no longer necessary.
Stijn van Drongelen
Add CPP blocks to deal with deprecations in aeson-1.0.0
aeson 1.0.0.0 deprecates Data.Aeson.Encode. This change changes
the relevant import statement to import from Data.Aeson.Text,
while retaining compatibility with pre-1.0.0 aeson through CPP.
@ghost

This comment has been minimized.

Copy link
Author

commented Jun 15, 2017

The Travis-CI failures are lies, of course.

@snoyberg snoyberg merged commit da1ae2d into snoyberg:master Jun 16, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@snoyberg

This comment has been minimized.

Copy link
Owner

commented Jun 16, 2017

Thanks!

snoyberg added a commit that referenced this pull request Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.