Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-ci-release-1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
muuki88 authored Aug 15, 2024
2 parents b9cef73 + b88e80a commit f511c34
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libraryDependencies ++= Seq(
// these dependencies have to be explicitly added by the user
"com.spotify" % "docker-client" % "8.16.0" % Provided,
"org.vafer" % "jdeb" % "1.10" % Provided artifacts Artifact("jdeb", "jar", "jar"),
"org.apache.commons" % "commons-compress" % "1.26.1",
"org.apache.commons" % "commons-compress" % "1.26.2",
// for jdkpackager
"org.apache.ant" % "ant" % "1.10.14",
// workaround for the command line size limit
Expand All @@ -29,7 +29,7 @@ libraryDependencies ++= Seq(
libraryDependencies ++= {
(pluginCrossBuild / sbtVersion).value match {
case v if v.startsWith("1.") =>
Seq("org.scala-sbt" %% "io" % "1.9.9")
Seq("org.scala-sbt" %% "io" % "1.10.0")
case _ => Seq()
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libraryDependencies += "jline" % "jline" % "2.14.6"
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

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

// for enterprise Artifactory compatibility
addSbtPlugin("com.scalawilliam.esbeetee" % "sbt-vspp" % "0.4.11")
2 changes: 1 addition & 1 deletion src/sbt-test/ash/top-level-main/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion src/sbt-test/bash/top-level-main/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1

0 comments on commit f511c34

Please sign in to comment.