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.

Sign up for GitHub

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

Remove explicit unused Scaffeine dependency from projects #3314

Merged
merged 2 commits into from
Dec 10, 2020
Merged

Remove explicit unused Scaffeine dependency from projects #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6d234
Rm unused scaffeine
pomadchin Dec 8, 2020
e61c102
Rm scaffeine from all projects where it is unused
pomadchin Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Remove explicit unused Scaffeine dependency from projects [#3314](https://github.com/locationtech/geotrellis/pull/3314)

## [3.5.1] - 2020-11-23

### Changed
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ lazy val `cassandra-spark` = project
lazy val hbase = project
.dependsOn(store)
.settings(Settings.hbase)
.settings(projectDependencies := { Seq((layer / projectID).value.exclude("com.google.protobuf", "protobuf-java")) })
.settings(projectDependencies := { Seq((store / projectID).value.exclude("com.google.protobuf", "protobuf-java")) })
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That worked only accidentially!


lazy val `hbase-spark` = project
.dependsOn(
Expand Down
9 changes: 2 additions & 7 deletions project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,7 @@ object Settings {
openCSV,
parserCombinators,
scalatest % Test,
scalacheck % Test,
scaffeine
scalacheck % Test
),
// https://github.com/sbt/sbt/issues/4609
Test / fork := true
Expand Down Expand Up @@ -485,7 +484,6 @@ object Settings {
libraryDependencies ++= Seq(
awsSdkS3 excludeAll ExclusionRule("com.fasterxml.jackson.core"),
spire,
scaffeine,
scalatest % Test
),
/** https://github.com/lucidworks/spark-solr/issues/179 */
Expand Down Expand Up @@ -519,7 +517,6 @@ object Settings {
libraryDependencies ++= Seq(
sparkCore % Provided,
spire,
scaffeine,
sparkSql % Test,
scalatest % Test
),
Expand Down Expand Up @@ -560,8 +557,7 @@ object Settings {
chronoscala,
sparkSql % Test,
scalatest % Test,
logging,
scaffeine
logging
),
mimaPreviousArtifacts := Set(
"org.locationtech.geotrellis" %% "geotrellis-spark" % Version.previousVersion
Expand Down Expand Up @@ -672,7 +668,6 @@ object Settings {
spire,
chronoscala,
logging,
scaffeine,
uzaygezenCore,
pureconfig,
scalactic,
Expand Down