Skip to content

Commit f69cfe3

Browse files
authored
match dependencies with geotrellis 3.6.3 (#602)
* Bump dependencies * allow fs2-core conflict * jts bugfix * sttp 3.7.0
1 parent 53c5934 commit f69cfe3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

project/RFDependenciesPlugin.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object RFDependenciesPlugin extends AutoPlugin {
3131
val rfGeoMesaVersion = settingKey[String]("GeoMesa version")
3232

3333
def geotrellis(module: String) = Def.setting {
34-
"org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeoTrellisVersion.value
34+
"org.locationtech.geotrellis" %% s"geotrellis-$module" % rfGeoTrellisVersion.value excludeAll("org.scala-lang.modules", "scala-xml")
3535
}
3636
def spark(module: String) = Def.setting {
3737
"org.apache.spark" %% s"spark-$module" % rfSparkVersion.value
@@ -41,7 +41,7 @@ object RFDependenciesPlugin extends AutoPlugin {
4141
}
4242
def circe(module: String) = Def.setting {
4343
module match {
44-
case "json-schema" => "io.circe" %% s"circe-$module" % "0.1.0"
44+
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
4545
case _ => "io.circe" %% s"circe-$module" % "0.14.1"
4646
}
4747
}
@@ -51,9 +51,9 @@ object RFDependenciesPlugin extends AutoPlugin {
5151
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.36"
5252
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.1.0"
5353
val `spray-json` = "io.spray" %% "spray-json" % "1.3.6"
54-
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
55-
val stac4s = "com.azavea.stac4s" %% "client" % "0.7.2"
56-
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.3.15"
54+
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
55+
val stac4s = "com.azavea.stac4s" %% "client" % "0.8.1"
56+
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.7.0"
5757
val frameless = "org.typelevel" %% "frameless-dataset" % "0.13.0"
5858
val framelessRefined = "org.typelevel" %% "frameless-refined" % "0.13.0"
5959
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
@@ -74,6 +74,6 @@ object RFDependenciesPlugin extends AutoPlugin {
7474
// NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
7575
rfSparkVersion := "3.3.1",
7676
rfGeoTrellisVersion := "3.6.3",
77-
rfGeoMesaVersion := "3.4.1"
77+
rfGeoMesaVersion := "3.5.1"
7878
)
7979
}

project/RFProjectPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object RFProjectPlugin extends AutoPlugin {
2020
scmInfo := Some(ScmInfo(url("https://github.com/locationtech/rasterframes"), "git@github.com:locationtech/rasterframes.git")),
2121
description := "RasterFrames brings the power of Spark DataFrames to geospatial raster data.",
2222
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html")),
23-
scalaVersion := "2.12.15",
23+
scalaVersion := "2.12.17",
2424
scalacOptions ++= Seq(
2525
"-target:jvm-1.8",
2626
"-feature",

0 commit comments

Comments
 (0)