Skip to content

Commit aae5f86

Browse files
authored
Add new shading rules to make GT work with Spark 3.x (#3397)
1 parent 422e6d5 commit aae5f86

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- Add method SpatialIndex#pointsInExtentAsIterable [#3349](https://github.com/locationtech/geotrellis/issues/3349)
1313
- Spark 3 & Hadoop 3 Support [#3218](https://github.com/locationtech/geotrellis/issues/3218)
1414
- Scala 2.13 cross compilation [#2893](https://github.com/locationtech/geotrellis/issues/2893)
15+
- Add new shading rules to make GT work with Spark 3.x [#3397](https://github.com/locationtech/geotrellis/pull/3397)
1516

1617
### Changed
1718
- Deprecate method SpatialIndex#traversePointsInExtent [#3349](https://github.com/locationtech/geotrellis/issues/3349)

project/Settings.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ object Settings {
564564
.inLibrary("com.azavea.geotrellis" %% "geotrellis-hbase" % version.value).inAll,
565565
ShadeRule.rename("com.fasterxml.jackson.**" -> s"$shadePackage.com.fasterxml.jackson.@1")
566566
.inLibrary(jsonSchemaValidator).inAll,
567-
ShadeRule.rename("shapeless.**" -> s"$shadePackage.shapeless.@1").inAll
567+
ShadeRule.rename("shapeless.**" -> s"$shadePackage.shapeless.@1").inAll,
568+
ShadeRule.rename("cats.kernel.**" -> s"$shadePackage.cats.kernel.@1").inAll
568569
)
569570
},
570571
assembly / assemblyMergeStrategy := {

0 commit comments

Comments
 (0)