Skip to content

Commit a330756

Browse files
pomadchinpomadchin
authored
Dependency updates (#3591)
* Dependency updates * Update Scala 2.12 compat deps
1 parent ec9f334 commit a330756

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎project/Dependencies.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import sbt._
1818

1919
object Version {
20-
val geotools = "33.0"
20+
val geotools = "33.2"
2121
val spire = "0.17.0"
2222
val accumulo = "1.10.4"
23-
val cassandra = "4.17.0"
24-
val hbase = "2.6.2"
25-
val hadoop = "3.4.1"
23+
val cassandra = "4.19.0"
24+
val hbase = "2.6.3"
25+
val hadoop = "3.4.2"
2626
val gdal = "3.10.1"
2727
val gdalWarp = "3.10.0"
2828

@@ -45,7 +45,7 @@ object Dependencies {
4545

4646
def cats(module: String) = Def.setting {
4747
module match {
48-
case "effect" => "org.typelevel" %% s"cats-$module" % "3.6.1"
48+
case "effect" => "org.typelevel" %% s"cats-$module" % "3.6.3"
4949
case _ => "org.typelevel" %% s"cats-$module" % "2.13.0"
5050
}
5151
}
@@ -54,33 +54,33 @@ object Dependencies {
5454
module match {
5555
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
5656
case "generic-extras" => "io.circe" %% s"circe-$module" % "0.14.4"
57-
case _ => "io.circe" %% s"circe-$module" % "0.14.12"
57+
case _ => "io.circe" %% s"circe-$module" % "0.14.14"
5858
}
5959
}
6060

6161
def fs2(module: String) = Def.setting {
62-
"co.fs2" %% s"fs2-$module" % "3.12.0"
62+
"co.fs2" %% s"fs2-$module" % "3.12.2"
6363
}
6464

6565
def apacheSpark(module: String) = Def.setting {
66-
"org.apache.spark" %% s"spark-$module" % "3.5.5"
66+
"org.apache.spark" %% s"spark-$module" % "3.5.7"
6767
}
6868

6969
def scalaReflect(version: String) = "org.scala-lang" % "scala-reflect" % version
7070

7171
val pureconfig = "com.github.pureconfig" %% "pureconfig" % "0.17.8"
7272
val log4s = "org.log4s" %% "log4s" % "1.10.0"
7373
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
74-
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.18.1"
75-
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
74+
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.19.0"
75+
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.4.0"
7676
val jts = "org.locationtech.jts" % "jts-core" % "1.20.0"
77-
val proj4j = "org.locationtech.proj4j" % "proj4j" % "1.4.0"
78-
val proj4jEPSG = "org.locationtech.proj4j" % "proj4j-epsg" % "1.4.0"
79-
val openCSV = "com.opencsv" % "opencsv" % "5.10"
77+
val proj4j = "org.locationtech.proj4j" % "proj4j" % "1.4.1"
78+
val proj4jEPSG = "org.locationtech.proj4j" % "proj4j-epsg" % "1.4.1"
79+
val openCSV = "com.opencsv" % "opencsv" % "5.12.0"
8080
val spire = "org.typelevel" %% "spire" % Version.spire
8181
val spireMacro = "org.typelevel" %% "spire-macros" % Version.spire
82-
val apacheIO = "commons-io" % "commons-io" % "2.19.0"
83-
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0"
82+
val apacheIO = "commons-io" % "commons-io" % "2.20.0"
83+
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.19.0"
8484
val apacheMath = "org.apache.commons" % "commons-math3" % "3.6.1"
8585
val chronoscala = "jp.ne.opt" %% "chronoscala" % "1.0.0"
8686
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.28.17"
@@ -92,13 +92,13 @@ object Dependencies {
9292
val sl4jnop = "org.slf4j" % "slf4j-nop" % "1.7.25"
9393
val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.3"
9494
val guava = "com.google.guava" % "guava" % "16.0.1"
95-
val zstdJni = "com.github.luben" % "zstd-jni" % "1.5.7-3"
95+
val zstdJni = "com.github.luben" % "zstd-jni" % "1.5.7-4"
9696

97-
val cassandraDriverCore = "com.datastax.oss" % "java-driver-core" % Version.cassandra
98-
val cassandraDriverQueryBuilder = "com.datastax.oss" % "java-driver-query-builder" % Version.cassandra
97+
val cassandraDriverCore = "org.apache.cassandra" % "java-driver-core" % Version.cassandra
98+
val cassandraDriverQueryBuilder = "org.apache.cassandra" % "java-driver-query-builder" % Version.cassandra
9999

100100
val scaffeine = "com.github.blemale" %% "scaffeine" % "5.3.0"
101-
val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "3.2.0"
101+
val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "v3.2.2"
102102

103103
val geotoolsCoverage = "org.geotools" % "gt-coverage" % Version.geotools
104104
val geotoolsHsql = "org.geotools" % "gt-epsg-hsql" % Version.geotools
@@ -115,9 +115,9 @@ object Dependencies {
115115

116116
val hbaseMapReduce = "org.apache.hbase" % "hbase-mapreduce" % Version.hbase
117117

118-
val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "7.1.0"
118+
val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "7.1.1"
119119
val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.2"
120-
val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.11.0"
120+
val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.12.0"
121121
val re2j = "com.google.re2j" % "re2j" % "1.8"
122122

123123
val jacksonCoreAsl = "org.codehaus.jackson" % "jackson-core-asl" % "1.9.13"
@@ -128,7 +128,7 @@ object Dependencies {
128128

129129
val scalapbRuntime = "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion
130130
val scalapbLenses = "com.thesamet.scalapb" %% "lenses" % scalapb.compiler.Version.scalapbVersion
131-
val protobufJava = "com.google.protobuf" % "protobuf-java" % "4.30.2"
131+
val protobufJava = "com.google.protobuf" % "protobuf-java" % "4.32.1"
132132

133133
val squants = "org.typelevel" %% "squants" % "1.8.3"
134134
val scalactic = "org.scalactic" %% "scalactic" % "3.2.19"
@@ -142,15 +142,15 @@ object Dependencies {
142142
val unitApi = "javax.measure" % "unit-api" % "2.2"
143143

144144
val scalaURI = "io.lemonlabs" %% "scala-uri" % "4.0.3"
145-
val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
145+
val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
146146

147147
// located in the OSGeo repo: https://repo.osgeo.org/repository/release/
148148
// 'works with' due to license issues
149149
val jaiCore = "javax.media" % "jai_core" % "1.1.3"
150150
val jaiCodec = "javax.media" % "jai_codec" % "1.1.3"
151151
val imageIo = "javax.media" % "jai_imageio" % "1.1"
152152

153-
val imageioExtUtilities = "it.geosolutions.imageio-ext" % "imageio-ext-utilities" % "1.4.15"
153+
val imageioExtUtilities = "it.geosolutions.imageio-ext" % "imageio-ext-utilities" % "1.4.16"
154154

155155
val worksWithDependencies = Seq(jaiCore, jaiCodec, imageIo, imageioExtUtilities).map(_ % Provided)
156156
}

‎project/Settings.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ object Settings {
104104
).filter(_.asFile.canRead).map(Credentials(_)),
105105

106106
addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full),
107-
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.13.4" cross CrossVersion.full),
107+
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.13.10" cross CrossVersion.full),
108108

109109
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
110110
case Some((2, 13)) => Nil
111111
case Some((2, 12)) => Seq(
112112
compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
113-
"org.scala-lang.modules" %% "scala-collection-compat" % "2.9.0"
113+
"org.scala-lang.modules" %% "scala-collection-compat" % "2.13.0"
114114
)
115115
case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}")
116116
}),

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.2
1+
sbt.version=1.11.6

‎project/plugins.sbt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
99
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
1010
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")
11-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")
11+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")
1212
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.1" )
13-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")
14-
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17"
13+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
14+
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.20"

0 commit comments

Comments
 (0)