Skip to content

Commit 89c6627

Browse files
committed
Fix pyrasterframes assembly build
1 parent 65baf9c commit 89c6627

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

build.sbt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,23 @@ lazy val core = project
5252
libraryDependencies ++= Seq(
5353
`slf4j-api`,
5454
shapeless,
55-
frameless,
55+
frameless excludeAll ExclusionRule("com.github.mpilquist", "simulacrum"),
5656
`jts-core`,
5757
`spray-json`,
5858
geomesa("z3").value,
5959
geomesa("spark-jts").value,
6060
spark("core").value % Provided,
6161
spark("mllib").value % Provided,
6262
spark("sql").value % Provided,
63-
geotrellis("spark").value,
64-
geotrellis("raster").value,
65-
geotrellis("s3").value,
63+
// TODO: scala-uri brings an outdated simulacrum dep
64+
// Fix it in GT
65+
geotrellis("spark").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
66+
geotrellis("raster").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
67+
geotrellis("s3").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
6668
geotrellis("spark-testkit").value % Test excludeAll (
6769
ExclusionRule(organization = "org.scalastic"),
68-
ExclusionRule(organization = "org.scalatest")
70+
ExclusionRule(organization = "org.scalatest"),
71+
ExclusionRule(organization = "com.github.mpilquist")
6972
),
7073
scaffeine,
7174
scalatest,
@@ -74,8 +77,8 @@ lazy val core = project
7477
libraryDependencies ++= {
7578
val gv = rfGeoTrellisVersion.value
7679
if (gv.startsWith("3")) Seq[ModuleID](
77-
geotrellis("gdal").value,
78-
geotrellis("s3-spark").value
80+
geotrellis("gdal").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
81+
geotrellis("s3-spark").value excludeAll ExclusionRule(organization = "com.github.mpilquist")
7982
)
8083
else Seq.empty[ModuleID]
8184
},
@@ -95,7 +98,7 @@ lazy val pyrasterframes = project
9598
.enablePlugins(RFAssemblyPlugin, PythonBuildPlugin)
9699
.settings(
97100
libraryDependencies ++= Seq(
98-
geotrellis("s3").value,
101+
geotrellis("s3").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
99102
spark("core").value % Provided,
100103
spark("mllib").value % Provided,
101104
spark("sql").value % Provided
@@ -110,9 +113,9 @@ lazy val datasource = project
110113
moduleName := "rasterframes-datasource",
111114
libraryDependencies ++= Seq(
112115
compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
113-
"com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.3.6",
116+
sttpCatsCe2,
114117
stac4s,
115-
geotrellis("s3").value,
118+
geotrellis("s3").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
116119
spark("core").value % Provided,
117120
spark("mllib").value % Provided,
118121
spark("sql").value % Provided
@@ -136,7 +139,7 @@ lazy val experimental = project
136139
.settings(
137140
moduleName := "rasterframes-experimental",
138141
libraryDependencies ++= Seq(
139-
geotrellis("s3").value,
142+
geotrellis("s3").value excludeAll ExclusionRule(organization = "com.github.mpilquist"),
140143
spark("core").value % Provided,
141144
spark("mllib").value % Provided,
142145
spark("sql").value % Provided

datasource/src/main/scala/org/locationtech/rasterframes/datasource/stac/api/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.apache.spark.sql.SparkSession
1010
import org.apache.spark.sql.functions.explode
1111

1212
package object api {
13-
// TODO: replace TypeTags with newtypes,
13+
// TODO: replace TypeTags with newtypes?
1414
trait StacApiDataFrameTag
1515
type StacApiDataFrameReader = DataFrameReader @@ StacApiDataFrameTag
1616
type StacApiDataFrame = DataFrame @@ StacApiDataFrameTag

project/PythonBuildPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ object PythonBuildPlugin extends AutoPlugin {
158158
packageBin := Def.sequential(
159159
Compile / packageBin,
160160
pyWhl,
161-
pyWhlAsZip,
161+
pyWhlAsZip
162162
).value,
163163
packageBin / artifact := {
164164
val java = (Compile / packageBin / artifact).value

project/RFAssemblyPlugin.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ object RFAssemblyPlugin extends AutoPlugin {
7676
assembly / assemblyMergeStrategy := {
7777
case "logback.xml" => MergeStrategy.singleOrError
7878
case "git.properties" => MergeStrategy.discard
79+
// com.sun.activation % jakarta.activation % 1.2.2
80+
// org.threeten % threeten-extra % 1.6.0
81+
case "module-info.class" => MergeStrategy.discard
7982
case x if Assembly.isConfigFile(x) => MergeStrategy.concat
8083
case PathList(ps @ _*) if Assembly.isReadme(ps.last) || Assembly.isLicenseFile(ps.last) =>
8184
MergeStrategy.rename

project/RFDependenciesPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ object RFDependenciesPlugin extends AutoPlugin {
4141
}
4242

4343
val scalatest = "org.scalatest" %% "scalatest" % "3.2.5" % Test
44-
val shapeless = "com.chuusai" %% "shapeless" % "2.3.3"
44+
val shapeless = "com.chuusai" %% "shapeless" % "2.3.7"
4545
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.17.0"
4646
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.28"
4747
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.0.2"
4848
val `spray-json` = "io.spray" %% "spray-json" % "1.3.4"
4949
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0"
5050
val stac4s = "com.azavea.stac4s" %% "client" % "0.6.2"
51+
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.3.6"
5152
val frameless = "org.typelevel" %% "frameless-dataset" % "0.10.1"
5253
}
5354
import autoImport._

0 commit comments

Comments
 (0)