[GH-1996] Shade S2 and Guava into runtime JARs#2054
Merged
Conversation
3686369 to
8b897e8
Compare
jiayuasu
approved these changes
Jul 4, 2025
Kontinuation
added a commit
to Kontinuation/sedona
that referenced
this pull request
Jan 21, 2026
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
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.
Did you read the Contributor Guide?
Is this PR related to a ticket?
[GH-XXX] my subject.What changes were proposed in this PR?
As discussed in #1996 (comment), we have switched s2 dependency to our own
org.datasyslab:s2-geometry-library. This may cause conflicts if there'scom.google.geometry:s2-geometrypackages in the runtime environment. We decided to shade it into runtime jars to get rid of possible conflicts.org.datasyslab:s2-geometry-librarydepends on a recent version of Guava, which is incompatible with the Guava jar shipped with Apache Spark, so we have to shade guava into runtime jars as well.We have also cherry-picked e005f23#diff-9c5fb3d1b7e3b0f54bc5c4182965c4fe1f9023d449017cece3005d3f90e8e4d8 into this PR, this is for fixing problems with shading janino found when releasing 1.7.2.
How was this patch tested?
Did this PR include necessary documentation updates?