Skip to content

Commit 0af5101

Browse files
committed
Workarounds for conflicting versions of cats.kernel and circe.
1 parent e4d8c37 commit 0af5101

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

build.sbt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ lazy val core = project
5252
libraryDependencies ++= Seq(
5353
`slf4j-api`,
5454
shapeless,
55+
circe("core").value,
56+
circe("generic").value,
57+
circe("parser").value,
58+
circe("generic-extras").value,
5559
frameless excludeAll ExclusionRule("com.github.mpilquist", "simulacrum"),
5660
`jts-core`,
5761
`spray-json`,
@@ -152,14 +156,14 @@ lazy val docs = project
152156
.dependsOn(core, datasource, pyrasterframes)
153157
.enablePlugins(SiteScaladocPlugin, ParadoxPlugin, ParadoxMaterialThemePlugin, GhpagesPlugin, ScalaUnidocPlugin)
154158
.settings(
155-
apiURL := Some(url("http://rasterframes.io/latest/api")),
159+
apiURL := Some(url("https://rasterframes.io/latest/api")),
156160
autoAPIMappings := true,
157161
ghpagesNoJekyll := true,
158162
ScalaUnidoc / siteSubdirName := "latest/api",
159163
paradox / siteSubdirName := ".",
160164
paradoxProperties ++= Map(
161165
"version" -> version.value,
162-
"scaladoc.org.apache.spark.sql.rf" -> "http://rasterframes.io/latest",
166+
"scaladoc.org.apache.spark.sql.rf" -> "https://rasterframes.io/latest",
163167
"github.base_url" -> ""
164168
),
165169
paradoxNavigationExpandDepth := Some(3),

project/RFAssemblyPlugin.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ object RFAssemblyPlugin extends AutoPlugin {
5252
val shadePrefixes = Seq(
5353
"shapeless",
5454
"com.github.mpilquist",
55+
"cats.kernel",
5556
"com.amazonaws",
5657
"org.apache.avro",
5758
"org.apache.http",

project/RFDependenciesPlugin.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ object RFDependenciesPlugin extends AutoPlugin {
3939
def geomesa(module: String) = Def.setting {
4040
"org.locationtech.geomesa" %% s"geomesa-$module" % rfGeoMesaVersion.value
4141
}
42-
42+
def circe(module: String) = Def.setting {
43+
module match {
44+
case "json-schema" => "io.circe" %% s"circe-$module" % "0.1.0"
45+
case _ => "io.circe" %% s"circe-$module" % "0.14.1"
46+
}
47+
}
4348
val scalatest = "org.scalatest" %% "scalatest" % "3.2.5" % Test
4449
val shapeless = "com.chuusai" %% "shapeless" % "2.3.7"
4550
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.17.0"

0 commit comments

Comments
 (0)