Merge pull request #112 from retronym/topic/jmh-upgrade

Author: retronym

build.sbt

@@ -1,3 +1,4 @@
+
 name := "compiler-benchmark"
 
 version := "1.0-SNAPSHOT"
@@ -26,11 +27,13 @@ resolvers in ThisBuild ++= (
   if (scalaVersion.value.endsWith("-SNAPSHOT"))
     List(
       "pr-scala snapshots" at "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/",
-      Resolver.mavenLocal)
+      )
   else
     Nil
 )
 
+resolvers in ThisBuild += Resolver.mavenLocal
+
 lazy val infrastructure = addJmh(project).settings(
   description := "Infrastrucuture to persist benchmark results annotated with metadata from Git",
   autoScalaLibrary := false,
@@ -61,7 +64,7 @@ lazy val compilation = addJmh(project).settings(
   mainClass in (Jmh, run) := Some("scala.bench.ScalacBenchmarkRunner"),
   libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
   testOptions in Test += Tests.Argument(TestFrameworks.JUnit),
-  fork in (Test, test) := true // jmh scoped tasks run with fork := true.
+  fork in (Test, test) := true, // jmh scoped tasks run with fork := true.
 ).settings(addJavaOptions).dependsOn(infrastructure)
 
 lazy val micro = addJmh(project).settings(
@@ -97,7 +100,7 @@ addCommandAlias("cold", "compilation/jmh:run ColdScalacBenchmark -foe true")
 commands ++= build.Profiler.commands
 
 // duplicated in project/build.sbt
-val jmhV = "1.27"
+val jmhV = System.getProperty("jmh.version", "1.30")
 
 def addJmh(project: Project): Project = {
   // IntelliJ SBT project import doesn't like sbt-jmh's default setup, which results the prod and test

corpus/scala/21d12e9/deps.txt

@@ -1 +1 @@
-http://repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/5.1.0-scala-2/scala-asm-5.1.0-scala-2.jar
+https://repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/5.1.0-scala-2/scala-asm-5.1.0-scala-2.jar

corpus/scala/df29ebb/deps.txt

@@ -1 +1 @@
-http://repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/5.1.0-scala-2/scala-asm-5.1.0-scala-2.jar
+https://repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/5.1.0-scala-2/scala-asm-5.1.0-scala-2.jar

project/build.sbt

@@ -1,4 +1,4 @@
-val jmhV = "1.27" // duplicated in build.sbt
+val jmhV = System.getProperty("jmh.version", "1.30")  // duplicated in build.sbt
 
 libraryDependencies ++= List(
   "org.openjdk.jmh"     % "jmh-core"                 % jmhV,

project/plugins.sbt

@@ -1,8 +1,10 @@
 // Comment to get more information during initialization
 logLevel := Level.Warn
 
+resolvers += Opts.resolver.sonatypeSnapshots
+
 // sbt-jmh plugin - pulls in JMH dependencies too
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
 
 // sbt-dotty plugin - to support `scalaVersion := "0.x"`
 addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.2")