Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-buildinfo-0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Apr 6, 2024
2 parents a89b67d + b8c63f7 commit 7fdd158
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Dependencies {

val scalaTest = "3.2.18"

val maven = "3.8.6"
val maven = "3.8.8"
}

object Compile {
Expand Down Expand Up @@ -72,7 +72,7 @@ object Dependencies {
.exclude("io.grpc", "grpc-alts")
.exclude("io.grpc", "grpc-xds")

val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.36"
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.12"
val mavenPluginApi = "org.apache.maven" % "maven-plugin-api" % Versions.maven
val mavenCore = "org.apache.maven" % "maven-core" % Versions.maven
val protocJar = "com.github.os72" % "protoc-jar" % "3.11.4"
Expand All @@ -90,7 +90,7 @@ object Dependencies {
}

object Runtime {
val logback = "ch.qos.logback" % "logback-classic" % "1.2.13" % "runtime"
val logback = "ch.qos.logback" % "logback-classic" % "1.3.14" % "runtime"
val guavaAndroid = "com.google.guava" % "guava" % "32.1.2-android" % "runtime"
}

Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV)
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
Expand All @@ -36,7 +36,7 @@ addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.5.0").excludeAll(
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")

// For RawText
libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r"
libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.3.202401111512-r"

// scripted testing
libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
Expand Down

0 comments on commit 7fdd158

Please sign in to comment.