Skip to content

match dependencies with geotrellis 3.6.3 #602

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

Merged
echeipesh merged 4 commits into from
Mar 27, 2023
Merged

match dependencies with geotrellis 3.6.3 #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5658915
Bump dependencies
echeipesh Mar 8, 2023
ceb7368
allow fs2-core conflict
echeipesh Mar 10, 2023
9455751
jts bugfix
echeipesh Mar 10, 2023
4f8236c
sttp 3.7.0
echeipesh Mar 13, 2023
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
12 changes: 6 additions & 6 deletions project/RFDependenciesPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ object RFDependenciesPlugin extends AutoPlugin {
val rfGeoMesaVersion = settingKey[String]("GeoMesa version")

def geotrellis(module: String) = Def.setting {
"org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeoTrellisVersion.value
"org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeoTrellisVersion.value excludeAll("org.scala-lang.modules", "scala-xml")
}
def spark(module: String) = Def.setting {
"org.apache.spark" %% s"spark-$module" % rfSparkVersion.value
Expand All @@ -41,7 +41,7 @@ object RFDependenciesPlugin extends AutoPlugin {
}
def circe(module: String) = Def.setting {
module match {
case "json-schema" => "io.circe" %% s"circe-$module" % "0.1.0"
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
case _ => "io.circe" %% s"circe-$module" % "0.14.1"
}
}
Expand All @@ -51,9 +51,9 @@ object RFDependenciesPlugin extends AutoPlugin {
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.36"
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.1.0"
val `spray-json` = "io.spray" %% "spray-json" % "1.3.6"
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
val stac4s = "com.azavea.stac4s" %% "client" % "0.7.2"
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.3.15"
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
val stac4s = "com.azavea.stac4s" %% "client" % "0.8.1"
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.7.0"
val frameless = "org.typelevel" %% "frameless-dataset" % "0.13.0"
val framelessRefined = "org.typelevel" %% "frameless-refined" % "0.13.0"
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
Expand All @@ -74,6 +74,6 @@ object RFDependenciesPlugin extends AutoPlugin {
// NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
rfSparkVersion := "3.3.1",
rfGeoTrellisVersion := "3.6.3",
rfGeoMesaVersion := "3.4.1"
rfGeoMesaVersion := "3.5.1"
)
}
2 changes: 1 addition & 1 deletion project/RFProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object RFProjectPlugin extends AutoPlugin {
scmInfo := Some(ScmInfo(url("https://github.com/locationtech/rasterframes"), "git@github.com:locationtech/rasterframes.git")),
description := "RasterFrames brings the power of Spark DataFrames to geospatial raster data.",
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),
scalaVersion := "2.12.15",
scalaVersion := "2.12.17",
scalacOptions ++= Seq(
"-target:jvm-1.8",
"-feature",
Expand Down