Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

Remove uses of Guava methods removed in Guava 21.0 #20

Merged
merged 1 commit into from
Apr 20, 2017

Conversation

shawnsmith
Copy link
Contributor

@shawnsmith shawnsmith commented Apr 18, 2017

The Objects.firstNonNull method was deprecated in Guava 18.0 and removed in Guava 21.0.

As far as I can tell, this change makes Proctor compatible with projects that use Guava 21.0.

This addresses the same problem as #18 but in a minimal way that should make it easier to merge.

@shawnsmith
Copy link
Contributor Author

FWIW, it looks like there's a test failing non-deterministically w/the CI build, unrelated to this PR.

@youknowjack
Copy link
Collaborator

Thanks, Shawn. My unmerged branch for #18 was conflating Guava 21 compatibility with "built with Guava 21 and Java 8". We'll get this merged and published.

@youknowjack youknowjack merged commit 0ae107e into indeedeng:master Apr 20, 2017
@shawnsmith shawnsmith deleted the guava21 branch April 20, 2017 21:35
@shawnsmith
Copy link
Contributor Author

Did this change cause problems? Looks above like it was merged, but release 1.1.37 (made this morning) doesn't have it and I don't see it in the commit history for master.

@youknowjack
Copy link
Collaborator

@shawnsmith I apologize, we have an issue with our syncing from private to public repo. Do you still have your branch around? If not, I can re-create your change from memory.

@shawnsmith
Copy link
Contributor Author

Yep, I have it. Just used it to create another PR #21. Thanks!

@youknowjack
Copy link
Collaborator

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants