Skip to content

Commit b16d847

Browse files
pomadchinpomadchin
authored
Dependencies update (#3530)
1 parent 3a368ca commit b16d847

File tree

7 files changed

+37
-36
lines changed

7 files changed

+37
-36
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Build and Test
1313
strategy:
1414
matrix:
15-
scala: ["2.12.17", "2.13.10"]
15+
scala: ["2.12.18", "2.13.12"]
1616
java: ["8", "11"]
1717
runs-on: ubuntu-latest
1818

‎build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import sbt.Keys._
22

33
ThisBuild / versionScheme := Some("semver-spec")
4-
ThisBuild / scalaVersion := "2.13.10"
4+
ThisBuild / scalaVersion := "2.13.12"
55
ThisBuild / organization := "org.locationtech.geotrellis"
6-
ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10")
6+
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12")
77

88
lazy val root = Project("geotrellis", file("."))
99
.aggregate(

‎project/Dependencies.scala

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import sbt._
1919
object Version {
2020
val geotools = "25.4"
2121
val spire = "0.17.0"
22-
val accumulo = "1.10.3"
23-
val cassandra = "4.15.0"
24-
val hbase = "2.5.4"
25-
val hadoop = "3.3.5"
22+
val accumulo = "1.10.4"
23+
val cassandra = "4.17.0"
24+
val hbase = "2.5.7"
25+
val hadoop = "3.3.6"
2626
val gdal = "3.1.0"
2727
val gdalWarp = "1.2.0"
2828

@@ -45,46 +45,47 @@ object Dependencies {
4545

4646
def cats(module: String) = Def.setting {
4747
module match {
48-
case "effect" => "org.typelevel" %% s"cats-$module" % "3.5.0"
49-
case _ => "org.typelevel" %% s"cats-$module" % "2.9.0"
48+
case "effect" => "org.typelevel" %% s"cats-$module" % "3.5.2"
49+
case _ => "org.typelevel" %% s"cats-$module" % "2.10.0"
5050
}
5151
}
5252

5353
def circe(module: String) = Def.setting {
5454
module match {
55-
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
56-
case _ => "io.circe" %% s"circe-$module" % "0.14.3"
55+
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
56+
case "generic-extras" => "io.circe" %% s"circe-$module" % "0.14.3"
57+
case _ => "io.circe" %% s"circe-$module" % "0.14.6"
5758
}
5859
}
5960

6061
def fs2(module: String) = Def.setting {
61-
"co.fs2" %% s"fs2-$module" % "3.7.0"
62+
"co.fs2" %% s"fs2-$module" % "3.9.3"
6263
}
6364

6465
def apacheSpark(module: String) = Def.setting {
65-
"org.apache.spark" %% s"spark-$module" % "3.4.0"
66+
"org.apache.spark" %% s"spark-$module" % "3.5.0"
6667
}
6768

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

7071
val pureconfig = "com.github.pureconfig" %% "pureconfig" % "0.17.4"
7172
val log4s = "org.log4s" %% "log4s" % "1.10.0"
72-
val scalatest = "org.scalatest" %% "scalatest" % "3.2.16"
73+
val scalatest = "org.scalatest" %% "scalatest" % "3.2.17"
7374
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
74-
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
75+
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
7576
val jts = "org.locationtech.jts" % "jts-core" % "1.19.0"
7677
val proj4j = "org.locationtech.proj4j" % "proj4j" % "1.3.0"
7778
val proj4jEPSG = "org.locationtech.proj4j" % "proj4j-epsg" % "1.3.0"
78-
val openCSV = "com.opencsv" % "opencsv" % "5.7.1"
79+
val openCSV = "com.opencsv" % "opencsv" % "5.9"
7980
val spire = "org.typelevel" %% "spire" % Version.spire
8081
val spireMacro = "org.typelevel" %% "spire-macros" % Version.spire
81-
val apacheIO = "commons-io" % "commons-io" % "2.12.0"
82-
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0"
82+
val apacheIO = "commons-io" % "commons-io" % "2.15.1"
83+
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.14.0"
8384
val apacheMath = "org.apache.commons" % "commons-math3" % "3.6.1"
8485
val chronoscala = "jp.ne.opt" %% "chronoscala" % "1.0.0"
85-
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.20.77"
86+
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.22.12"
8687
val hadoopClient = "org.apache.hadoop" % "hadoop-client" % Version.hadoop
87-
val avro = "org.apache.avro" % "avro" % "1.11.1" // aligned with the Spark version
88+
val avro = "org.apache.avro" % "avro" % "1.11.2" // aligned with the Spark version
8889
val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0"
8990
val jsonSchemaValidator = "com.networknt" % "json-schema-validator" % "0.1.23"
9091
val accumuloCore = "org.apache.accumulo" % "accumulo-core" % Version.accumulo
@@ -115,7 +116,7 @@ object Dependencies {
115116
val hbaseMapReduce = "org.apache.hbase" % "hbase-mapreduce" % Version.hbase
116117

117118
val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "6.5.1"
118-
val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.1"
119+
val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.2"
119120
val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.9.0"
120121
val re2j = "com.google.re2j" % "re2j" % "1.7"
121122

@@ -127,10 +128,10 @@ object Dependencies {
127128

128129
val scalapbRuntime = "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion
129130
val scalapbLenses = "com.thesamet.scalapb" %% "lenses" % scalapb.compiler.Version.scalapbVersion
130-
val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.23.2"
131+
val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.1"
131132

132133
val squants = "org.typelevel" %% "squants" % "1.8.3"
133-
val scalactic = "org.scalactic" %% "scalactic" % "3.2.16"
134+
val scalactic = "org.scalactic" %% "scalactic" % "3.2.17"
134135

135136
val gdalBindings = "org.gdal" % "gdal" % Version.gdal
136137
val gdalWarp = "com.azavea.geotrellis" % "gdal-warp-bindings" % Version.gdalWarp

‎project/Settings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ object Settings {
100100
).filter(_.asFile.canRead).map(Credentials(_)),
101101

102102
addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full),
103-
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.7.8" cross CrossVersion.full),
103+
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.8.15" cross CrossVersion.full),
104104

105105
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
106106
case Some((2, 13)) => Nil
@@ -611,7 +611,7 @@ object Settings {
611611
apacheIO,
612612
scaffeine,
613613
caffeine,
614-
uzaygezenCore,
614+
uzaygezenCore exclude("log4j", "log4j"),
615615
scalaXml,
616616
apacheLang3,
617617
fs2("core").value,

‎project/build.properties

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

‎project/plugins.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
resolvers += sbt.Resolver.bintrayIvyRepo("typesafe", "sbt-plugins")
22

33
addDependencyTreePlugin
4-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
4+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
55
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
66
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
7-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
7+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
88
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
9-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
9+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
1010
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
11-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
12-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7" )
11+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
12+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2" )
1313
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
14-
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"
14+
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.14"

‎sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
set -o pipefail
3636

37-
declare -r sbt_release_version="1.8.3"
38-
declare -r sbt_unreleased_version="1.9.0-RC3"
37+
declare -r sbt_release_version="1.9.7"
38+
declare -r sbt_unreleased_version="1.9.7"
3939

40-
declare -r latest_213="2.13.10"
41-
declare -r latest_212="2.12.17"
40+
declare -r latest_213="2.13.12"
41+
declare -r latest_212="2.12.18"
4242
declare -r latest_211="2.11.12"
4343
declare -r latest_210="2.10.7"
4444
declare -r latest_29="2.9.3"

0 commit comments

Comments
 (0)