Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-native-packager-1.9.14
Browse files Browse the repository at this point in the history
  • Loading branch information
pnerg committed Apr 10, 2024
2 parents be7f8ec + c388d1b commit f114b52
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with sbt-java-formatter 0.8.0
f2ef152699b88e1be17c4ca2f0b113c1d804c359
1 change: 0 additions & 1 deletion lib/src/main/java/org/dmonix/jmx/JMXJsonBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.eclipsesource.json.JsonArray;
import com.eclipsesource.json.JsonObject;
import com.eclipsesource.json.WriterConfig;

import java.io.File;
import java.lang.management.*;

Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object Dependencies extends AutoPlugin {
* Test dependencies
* ------------------------------
*/
val `specs2-core` = "org.specs2" %% "specs2-core" % "4.13.1"
val `specs2-core` = "org.specs2" %% "specs2-core" % "4.13.3"
}

}
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")
addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.14")

0 comments on commit f114b52

Please sign in to comment.