Skip to content

Commit 000650e

Browse files
authored
Merge pull request #102 from retronym/topic/multi-command
Avoid SBT's new multi-command parser from eating our ;
2 parents 9dd0d7c + 7889d2d commit 000650e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "compiler-benchmark"
22

33
version := "1.0-SNAPSHOT"
44

5-
def scala212 = "2.12.8"
5+
def scala212 = "2.12.11"
66
def dottyLatest = "0.22.0-RC1"
77
scalaVersion in ThisBuild := scala212
88
val JmhConfig = config("jmh")

project/Profilers.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ case object jfr extends Profiler("jfr") {
3939
}
4040
sealed abstract class async(event: String) extends Profiler("async-" + event) {
4141
val framebuf = 33554432
42-
def command(outDir: File): String = s"-prof jmh.extras.Async:dir=${outDir.getAbsolutePath};flameGraphOpts=$flameGraphOpts;verbose=true;event=$event;framebuf=$framebuf" // + ";simplename=true" TODO add this after upgrading next sbt-jmh release
42+
def command(outDir: File): String = {
43+
s"""-prof "jmh.extras.Async:dir=${outDir.getAbsolutePath};flameGraphOpts=$flameGraphOpts;verbose=true;event=$event;framebuf=${framebuf}" """
44+
} // + ";simplename=true" TODO add this after upgrading next sbt-jmh release
4345
}
4446
case object asyncCpu extends async("cpu")
4547
case object asyncAlloc extends async("alloc")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.3.7
1+
sbt.version=1.3.10
22

0 commit comments

Comments
 (0)