From f69cfe3ee4d856575a4027e3f69df7235aebad3b Mon Sep 17 00:00:00 2001
From: Eugene Cheipesh <echeipesh@gmail.com>
Date: Mon, 27 Mar 2023 15:56:57 -0400
Subject: [PATCH] match dependencies with geotrellis 3.6.3 (#602)

* Bump dependencies

* allow fs2-core conflict

* jts bugfix

* sttp 3.7.0
---
 project/RFDependenciesPlugin.scala | 12 ++++++------
 project/RFProjectPlugin.scala      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/RFDependenciesPlugin.scala b/project/RFDependenciesPlugin.scala
index 29ef997a2..2fb955725 100644
--- a/project/RFDependenciesPlugin.scala
+++ b/project/RFDependenciesPlugin.scala
@@ -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
@@ -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"
       }
     }
@@ -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
@@ -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"
   )
 }
diff --git a/project/RFProjectPlugin.scala b/project/RFProjectPlugin.scala
index c25d74855..7692a825c 100644
--- a/project/RFProjectPlugin.scala
+++ b/project/RFProjectPlugin.scala
@@ -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",