From b16d847db625ec543e89cd006b98303d26878256 Mon Sep 17 00:00:00 2001 From: Grigory Date: Sun, 7 Jan 2024 23:18:07 -0500 Subject: [PATCH] Dependencies update (#3530) --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- project/Dependencies.scala | 41 +++++++++++++++++++------------------- project/Settings.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 12 +++++------ sbt | 8 ++++---- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4487d17e90..4e1e2cb1d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: name: Build and Test strategy: matrix: - scala: ["2.12.17", "2.13.10"] + scala: ["2.12.18", "2.13.12"] java: ["8", "11"] runs-on: ubuntu-latest diff --git a/build.sbt b/build.sbt index 70cced3a4c..794b74304e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ import sbt.Keys._ ThisBuild / versionScheme := Some("semver-spec") -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.12" ThisBuild / organization := "org.locationtech.geotrellis" -ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10") +ThisBuild / crossScalaVersions := List("2.12.18", "2.13.12") lazy val root = Project("geotrellis", file(".")) .aggregate( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c9e6803fea..2d7f972960 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,10 +19,10 @@ import sbt._ object Version { val geotools = "25.4" val spire = "0.17.0" - val accumulo = "1.10.3" - val cassandra = "4.15.0" - val hbase = "2.5.4" - val hadoop = "3.3.5" + val accumulo = "1.10.4" + val cassandra = "4.17.0" + val hbase = "2.5.7" + val hadoop = "3.3.6" val gdal = "3.1.0" val gdalWarp = "1.2.0" @@ -45,46 +45,47 @@ object Dependencies { def cats(module: String) = Def.setting { module match { - case "effect" => "org.typelevel" %% s"cats-$module" % "3.5.0" - case _ => "org.typelevel" %% s"cats-$module" % "2.9.0" + case "effect" => "org.typelevel" %% s"cats-$module" % "3.5.2" + case _ => "org.typelevel" %% s"cats-$module" % "2.10.0" } } def circe(module: String) = Def.setting { module match { - case "json-schema" => "io.circe" %% s"circe-$module" % "0.2.0" - case _ => "io.circe" %% s"circe-$module" % "0.14.3" + 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.6" } } def fs2(module: String) = Def.setting { - "co.fs2" %% s"fs2-$module" % "3.7.0" + "co.fs2" %% s"fs2-$module" % "3.9.3" } def apacheSpark(module: String) = Def.setting { - "org.apache.spark" %% s"spark-$module" % "3.4.0" + "org.apache.spark" %% s"spark-$module" % "3.5.0" } def scalaReflect(version: String) = "org.scala-lang" % "scala-reflect" % version val pureconfig = "com.github.pureconfig" %% "pureconfig" % "0.17.4" val log4s = "org.log4s" %% "log4s" % "1.10.0" - val scalatest = "org.scalatest" %% "scalatest" % "3.2.16" + val scalatest = "org.scalatest" %% "scalatest" % "3.2.17" val scalacheck = "org.scalacheck" %% "scalacheck" % "1.17.0" - val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.1.0" + val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.2.0" val jts = "org.locationtech.jts" % "jts-core" % "1.19.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.7.1" + 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.12.0" - val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0" + val apacheIO = "commons-io" % "commons-io" % "2.15.1" + val apacheLang3 = "org.apache.commons" % "commons-lang3" % "3.14.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.20.77" + val awsSdkS3 = "software.amazon.awssdk" % "s3" % "2.22.12" val hadoopClient = "org.apache.hadoop" % "hadoop-client" % Version.hadoop - val avro = "org.apache.avro" % "avro" % "1.11.1" // aligned with the Spark version + val avro = "org.apache.avro" % "avro" % "1.11.2" // aligned with the Spark version val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0" val jsonSchemaValidator = "com.networknt" % "json-schema-validator" % "0.1.23" val accumuloCore = "org.apache.accumulo" % "accumulo-core" % Version.accumulo @@ -115,7 +116,7 @@ object Dependencies { val hbaseMapReduce = "org.apache.hbase" % "hbase-mapreduce" % Version.hbase val woodstoxCore = "com.fasterxml.woodstox" % "woodstox-core" % "6.5.1" - val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.1" + val stax2Api = "org.codehaus.woodstox" % "stax2-api" % "4.2.2" val commonsConfiguration2 = "org.apache.commons" % "commons-configuration2" % "2.9.0" val re2j = "com.google.re2j" % "re2j" % "1.7" @@ -127,10 +128,10 @@ 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.23.2" + val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.1" val squants = "org.typelevel" %% "squants" % "1.8.3" - val scalactic = "org.scalactic" %% "scalactic" % "3.2.16" + val scalactic = "org.scalactic" %% "scalactic" % "3.2.17" val gdalBindings = "org.gdal" % "gdal" % Version.gdal val gdalWarp = "com.azavea.geotrellis" % "gdal-warp-bindings" % Version.gdalWarp diff --git a/project/Settings.scala b/project/Settings.scala index 89753a527c..78982dcf15 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -100,7 +100,7 @@ object Settings { ).filter(_.asFile.canRead).map(Credentials(_)), addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full), - addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.7.8" cross CrossVersion.full), + addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.8.15" cross CrossVersion.full), libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 13)) => Nil @@ -611,7 +611,7 @@ object Settings { apacheIO, scaffeine, caffeine, - uzaygezenCore, + uzaygezenCore exclude("log4j", "log4j"), scalaXml, apacheLang3, fs2("core").value, diff --git a/project/build.properties b/project/build.properties index 40b3b8e7b6..e8a1e246e8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index f0145116b6..3c8df79c5d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,14 +1,14 @@ resolvers += sbt.Resolver.bintrayIvyRepo("typesafe", "sbt-plugins") addDependencyTreePlugin -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") +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.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7" ) +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.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.13" +libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.14" diff --git a/sbt b/sbt index 68fe1e5582..f63a9ee5a7 100755 --- a/sbt +++ b/sbt @@ -34,11 +34,11 @@ set -o pipefail -declare -r sbt_release_version="1.8.3" -declare -r sbt_unreleased_version="1.9.0-RC3" +declare -r sbt_release_version="1.9.7" +declare -r sbt_unreleased_version="1.9.7" -declare -r latest_213="2.13.10" -declare -r latest_212="2.12.17" +declare -r latest_213="2.13.12" +declare -r latest_212="2.12.18" declare -r latest_211="2.11.12" declare -r latest_210="2.10.7" declare -r latest_29="2.9.3"