Skip to content

Commit 1e314ea

Browse files
authored
Merge pull request #582 from s22s/fix/ci-issue
CI fix.
2 parents c805b1b + 8d2bff4 commit 1e314ea

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
// Leave me an my custom keys alone!
22+
// Leave me and my custom keys alone!
2323
Global / lintUnusedKeysOnLoad := false
2424

2525
addCommandAlias("makeSite", "docs/makeSite")

project/RFDependenciesPlugin.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ object RFDependenciesPlugin extends AutoPlugin {
4646
}
4747
}
4848
val scalatest = "org.scalatest" %% "scalatest" % "3.2.5" % Test
49-
val shapeless = "com.chuusai" %% "shapeless" % "2.3.7"
50-
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.17.0"
51-
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.28"
52-
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.0.2"
53-
val `spray-json` = "io.spray" %% "spray-json" % "1.3.4"
54-
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0"
49+
val shapeless = "com.chuusai" %% "shapeless" % "2.3.9"
50+
val `jts-core` = "org.locationtech.jts" % "jts-core" % "1.18.2"
51+
val `slf4j-api` = "org.slf4j" % "slf4j-api" % "1.7.36"
52+
val scaffeine = "com.github.blemale" %% "scaffeine" % "5.1.2"
53+
val `spray-json` = "io.spray" %% "spray-json" % "1.3.6"
54+
val `scala-logging` = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4"
5555
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"
56+
val sttpCatsCe2 = "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats-ce2" % "3.5.1"
5757
val frameless = "org.typelevel" %% "frameless-dataset-spark31" % "0.11.1"
5858
val framelessRefined = "org.typelevel" %% "frameless-refined-spark31" % "0.11.1"
59-
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1" % Test
59+
val `better-files` = "com.github.pathikrit" %% "better-files" % "3.9.1"
6060
}
6161
import autoImport._
6262

@@ -70,7 +70,7 @@ object RFDependenciesPlugin extends AutoPlugin {
7070
"jitpack" at "https://jitpack.io"
7171
),
7272
// NB: Make sure to update the Spark version in pyrasterframes/python/setup.py
73-
rfSparkVersion := "3.1.2",
73+
rfSparkVersion := "3.1.3",
7474
rfGeoTrellisVersion := "3.6.1",
7575
rfGeoMesaVersion := "3.2.0",
7676
excludeDependencies += "log4j" % "log4j"

pyrasterframes/src/main/python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def dest_file(self, src_file):
140140
# to throw a `NotImplementedError: Can't perform this operation for unregistered loader type`
141141
pytest = 'pytest>=4.0.0,<5.0.0'
142142

143-
pyspark = 'pyspark==3.1.2'
143+
pyspark = 'pyspark==3.1.3'
144144
boto3 = 'boto3'
145145
deprecation = 'deprecation'
146146
descartes = 'descartes'

0 commit comments

Comments
 (0)