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

Dependency upgrades #1595

Merged
merged 8 commits into from
Apr 12, 2024
Merged

Dependency upgrades #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a4946c
Update commons-compress to 1.26.1
scala-steward Mar 10, 2024
b4738a3
Update io to 1.9.9
scala-steward Feb 23, 2024
65cb4f7
Update jdeb to 1.10
scala-steward Feb 20, 2024
591f1af
Update scalatest to 3.0.9
scala-steward Feb 20, 2024
ecb73d1
Update scala-xml to 2.2.0
scala-steward Feb 20, 2024
ec34460
Update jline to 2.14.6
scala-steward Feb 20, 2024
bd5f9d3
Update sbt-mima-plugin to 1.1.3
scala-steward Feb 20, 2024
baa8b9b
Update docker-client to 8.14.5
scala-steward Feb 20, 2024
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
12 changes: 6 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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")
Loading