Skip to content

Commit

Permalink
Dependency upgrades (#1595)
Browse files Browse the repository at this point in the history
* Update commons-compress to 1.26.1

* Update io to 1.9.9

* Update jdeb to 1.10

* Update scalatest to 3.0.9

* Update scala-xml to 2.2.0

* Update jline to 2.14.6

* Update sbt-mima-plugin to 1.1.3

* Update docker-client to 8.14.5

---------

Co-authored-by: Scala Steward <scala_steward@virtuslab.com>
  • Loading branch information
mkurz and scala-steward committed Apr 12, 2024
1 parent 612d391 commit 3894d05
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Expand Up @@ -15,21 +15,21 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
classpathTypes += "maven-plugin"
libraryDependencies ++= Seq(
// these dependencies have to be explicitly added by the user
"com.spotify" % "docker-client" % "8.14.3" % Provided,
"org.vafer" % "jdeb" % "1.7" % Provided artifacts Artifact("jdeb", "jar", "jar"),
"org.apache.commons" % "commons-compress" % "1.21",
"com.spotify" % "docker-client" % "8.14.5" % Provided,
"org.vafer" % "jdeb" % "1.10" % Provided artifacts Artifact("jdeb", "jar", "jar"),
"org.apache.commons" % "commons-compress" % "1.26.1",
// for jdkpackager
"org.apache.ant" % "ant" % "1.10.14",
// workaround for the command line size limit
"com.github.eldis" % "tool-launcher" % "0.2.2",
"org.scalatest" %% "scalatest" % "3.0.5" % Test
"org.scalatest" %% "scalatest" % "3.0.9" % Test
)

// sbt dependent libraries
libraryDependencies ++= {
(pluginCrossBuild / sbtVersion).value match {
case v if v.startsWith("1.") =>
Seq("org.scala-sbt" %% "io" % "1.2.2")
Seq("org.scala-sbt" %% "io" % "1.9.9")
case _ => Seq()
}
}
Expand All @@ -45,7 +45,7 @@ libraryDependencies ++= {
// like the 2.12.x Scala compiler, otherwise we run into conflicts when using sbt 1.5+
// See https://github.com/scala/scala/pull/9743
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2", // Do not upgrade beyond 1.x
"org.scala-lang.modules" %% "scala-xml" % "2.1.0"
"org.scala-lang.modules" %% "scala-xml" % "2.2.0"
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Expand Up @@ -7,13 +7,13 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

// Scripted plugin needs to declare this as a dependency
libraryDependencies += "jline" % "jline" % "2.11"
libraryDependencies += "jline" % "jline" % "2.14.6"

// For code formatting
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")

// binary compatibility checks
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

// for enterprise Artifactory compatibility
addSbtPlugin("com.scalawilliam.esbeetee" % "sbt-vspp" % "0.4.11")

0 comments on commit 3894d05

Please sign in to comment.