Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies update #3551

Merged
merged 1 commit into from
Oct 19, 2024
Merged

Dependencies update #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Build and Test
strategy:
matrix:
scala: ["2.12.19", "2.13.14"]
scala: ["2.12.19", "2.13.15"]
java: ["11", "21"]
runs-on: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import sbt.Keys._

ThisBuild / versionScheme := Some("semver-spec")
ThisBuild / scalaVersion := "2.13.14"
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / organization := "org.locationtech.geotrellis"
ThisBuild / crossScalaVersions := List("2.12.19", "2.13.14")
ThisBuild / crossScalaVersions := List("2.13.15", "2.12.19")

lazy val root = Project("geotrellis", file("."))
.aggregate(
Expand Down
48 changes: 24 additions & 24 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
import sbt._

object Version {
val geotools = "31.0"
val geotools = "32.0"
val spire = "0.17.0"
val accumulo = "1.10.4"
val cassandra = "4.17.0"
val hbase = "2.5.8"
val hadoop = "3.3.6"
val hbase = "2.6.0"
val hadoop = "3.4.0"
val gdal = "3.9.0"
val gdalWarp = "3.9.0"
val gdalWarp = "3.9.1"

val previousVersion = "3.6.0"
}
Expand All @@ -46,44 +46,44 @@ object Dependencies {
def cats(module: String) = Def.setting {
module match {
case "effect" => "org.typelevel" %% s"cats-$module" % "3.5.4"
case _ => "org.typelevel" %% s"cats-$module" % "2.10.0"
case _ => "org.typelevel" %% s"cats-$module" % "2.12.0"
}
}

def circe(module: String) = Def.setting {
module match {
case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0"
case "generic-extras" => "io.circe" %% s"circe-$module" % "0.14.3"
case _ => "io.circe" %% s"circe-$module" % "0.14.7"
case "generic-extras" => "io.circe" %% s"circe-$module" % "0.14.4"
case _ => "io.circe" %% s"circe-$module" % "0.14.10"
}
}

def fs2(module: String) = Def.setting {
"co.fs2" %% s"fs2-$module" % "3.10.2"
"co.fs2" %% s"fs2-$module" % "3.11.0"
}

def apacheSpark(module: String) = Def.setting {
"org.apache.spark" %% s"spark-$module" % "3.5.1"
"org.apache.spark" %% s"spark-$module" % "3.5.3"
}

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

val pureconfig = "com.github.pureconfig" %% "pureconfig" % "0.17.6"
val pureconfig = "com.github.pureconfig" %% "pureconfig" % "0.17.7"
val log4s = "org.log4s" %% "log4s" % "1.10.0"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.18"
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.18.0"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.18.1"
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
val jts = "org.locationtech.jts" % "jts-core" % "1.19.0"
val jts = "org.locationtech.jts" % "jts-core" % "1.20.0"
val proj4j = "org.locationtech.proj4j" % "proj4j" % "1.3.0"
val proj4jEPSG = "org.locationtech.proj4j" % "proj4j-epsg" % "1.3.0"
val openCSV = "com.opencsv" % "opencsv" % "5.9"
val spire = "org.typelevel" %% "spire" % Version.spire
val spireMacro = "org.typelevel" %% "spire-macros" % Version.spire
val apacheIO = "commons-io" % "commons-io" % "2.16.1"
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.14.0"
val apacheIO = "commons-io" % "commons-io" % "2.17.0"
val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.17.0"
val apacheMath = "org.apache.commons" % "commons-math3" % "3.6.1"
val chronoscala = "jp.ne.opt" %% "chronoscala" % "1.0.0"
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.25.50"
val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.28.17"
val hadoopClient = "org.apache.hadoop" % "hadoop-client" % Version.hadoop
val avro = "org.apache.avro" % "avro" % "1.11.3" // aligned with the Spark version
val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0"
Expand All @@ -96,7 +96,7 @@ object Dependencies {
val cassandraDriverCore = "com.datastax.oss" % "java-driver-core" % Version.cassandra
val cassandraDriverQueryBuilder = "com.datastax.oss" % "java-driver-query-builder" % Version.cassandra

val scaffeine = "com.github.blemale" %% "scaffeine" % "5.2.1"
val scaffeine = "com.github.blemale" %% "scaffeine" % "5.3.0"
val caffeine = "com.github.ben-manes.caffeine" % "caffeine" % "3.1.8"

val geotoolsCoverage = "org.geotools" % "gt-coverage" % Version.geotools
Expand All @@ -114,9 +114,9 @@ object Dependencies {

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

val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "6.6.2"
val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "7.0.0"
val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.2"
val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.10.1"
val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.11.0"
val re2j = "com.google.re2j" % "re2j" % "1.7"

val jacksonCoreAsl = "org.codehaus.jackson" % "jackson-core-asl" % "1.9.13"
Expand All @@ -127,18 +127,18 @@ object Dependencies {

val scalapbRuntime = "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion
val scalapbLenses = "com.thesamet.scalapb" %% "lenses" % scalapb.compiler.Version.scalapbVersion
val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.1"
val protobufJava = "com.google.protobuf" % "protobuf-java" % "4.28.2"

val squants = "org.typelevel" %% "squants" % "1.8.3"
val scalactic = "org.scalactic" %% "scalactic" % "3.2.18"
val scalactic = "org.scalactic" %% "scalactic" % "3.2.19"

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

val shapeless = "com.chuusai" %% "shapeless" % "2.3.10"
val shapeless = "com.chuusai" %% "shapeless" % "2.3.12"

// aligned with the GeoTools version
val unitApi = "javax.measure" % "unit-api" % "2.1.3"
val unitApi = "javax.measure" % "unit-api" % "2.2"

val scalaURI = "io.lemonlabs" %% "scala-uri" % "4.0.3"
val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
Expand All @@ -149,7 +149,7 @@ object Dependencies {
val jaiCodec = "javax.media" % "jai_codec" % "1.1.3"
val imageIo = "javax.media" % "jai_imageio" % "1.1"

val imageioExtUtilities = "it.geosolutions.imageio-ext" % "imageio-ext-utilities" % "1.4.10"
val imageioExtUtilities = "it.geosolutions.imageio-ext" % "imageio-ext-utilities" % "1.4.13"

val worksWithDependencies = Seq(jaiCore, jaiCodec, imageIo, imageioExtUtilities).map(_ % Provided)
}
2 changes: 1 addition & 1 deletion project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ object Settings {
).filter(_.asFile.canRead).map(Credentials(_)),

addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full),
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.9.3" cross CrossVersion.full),
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.10.1" cross CrossVersion.full),

libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 13)) => Nil
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.2
14 changes: 7 additions & 7 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
resolvers += sbt.Resolver.bintrayIvyRepo("typesafe", "sbt-plugins")

addDependencyTreePlugin
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2" )
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15"
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1" )
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.7.0")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17"