Merge pull request #108 from retronym/topic/bumpity

Bump SBT and SBT plugin versions

Author: retronym

build.sbt

@@ -96,15 +96,10 @@ addCommandAlias("cold", "compilation/jmh:run ColdScalacBenchmark -foe true")
 
 commands ++= build.Profiler.commands
 
-// duplicated in project/build.sbt
-val jmhV = "1.25"
-
 def addJmh(project: Project): Project = {
   // IntelliJ SBT project import doesn't like sbt-jmh's default setup, which results the prod and test
   // output paths overlapping. This is because sbt-jmh declares the `jmh` config as extending `test`, but
   // configures `classDirectory in Jmh := classDirectory in Compile`.
-  project.enablePlugins(JmhPlugin).overrideConfigs(JmhConfig.extend(Compile)).settings(
-    version in Jmh := jmhV
-  )
+  project.enablePlugins(JmhPlugin).overrideConfigs(JmhConfig.extend(Compile))
 }
 

project/Profilers.scala

@@ -40,8 +40,10 @@ case object jfr extends Profiler("jfr") {
 sealed abstract class async(event: String) extends Profiler("async-" + event) {
   val framebuf = 33554432
   def command(outDir: File): String = {
-    s"""-prof "async:dir=${outDir.getAbsolutePath};libPath=${System.getenv("ASYNC_PROFILER_DIR")}/build/libasyncProfiler.so;minwidth=1;width=1800;verbose=true;event=$event;filter=${event == "wall"};flat=40;trace=10;framebuf=${framebuf};output=flamegraph,jfr,text" """
-  } // + ";simplename=true" TODO add this after upgrading next sbt-jmh release
+    val r = s"""-prof "async:dir=${outDir.getAbsolutePath};libPath=${System.getenv("ASYNC_PROFILER_DIR")}/build/libasyncProfiler.so;minwidth=1;width=1800;verbose=true;event=$event;filter=${event == "wall"};flat=40;trace=10;framebuf=${framebuf};output=flamegraph,jfr,text" """
+    println(r)
+    r
+  }
 }
 case object asyncCpu extends async("cpu")
 case object asyncAlloc extends async("alloc")

project/build.sbt

@@ -1,9 +1 @@
-val jmhV = "1.25" // duplicated in build.sbt
-
-libraryDependencies ++= List(
-  "org.openjdk.jmh"     % "jmh-core"                 % jmhV,
-  "org.openjdk.jmh"     % "jmh-generator-bytecode"   % jmhV,
-  "org.openjdk.jmh"     % "jmh-generator-reflection" % jmhV
-)
-
 resolvers in Global += Resolver.mavenLocal

project/plugins.sbt

@@ -2,7 +2,7 @@
 logLevel := Level.Warn
 
 // sbt-jmh plugin - pulls in JMH dependencies too
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
 
 // sbt-dotty plugin - to support `scalaVersion := "0.x"`
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.0")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.2")