Merge pull request #123 from lrytz/updates

update sbt

Author: lrytz

build.sbt

@@ -58,8 +58,8 @@ lazy val compilation = addJmh(project).settings(
     else scalaOrganization.value % "scala-compiler" % scalaVersion.value
   },
   crossScalaVersions := List(scala212, dottyLatest),
-  unmanagedSourceDirectories.in(Compile) +=
-    sourceDirectory.in(Compile).value / (if (isDotty.value) "dotc" else "scalac"),
+  Compile / unmanagedSourceDirectories +=
+    (Compile / sourceDirectory).value / (if (isDotty.value) "dotc" else "scalac"),
   Jmh / run / mainClass := Some("scala.bench.ScalacBenchmarkRunner"),
   libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
   Test / testOptions += Tests.Argument(TestFrameworks.JUnit),

project/Profilers.scala

@@ -6,7 +6,7 @@ import java.io.File
 import sbt._
 import sbt.complete.DefaultParsers.OptSpace
 import sbt.complete.Parser
-import sbt.internal.inc.classpath.ClasspathUtilities
+import sbt.internal.inc.classpath.ClasspathUtil
 
 import java.util.stream.Collectors
 
@@ -32,7 +32,7 @@ object Profiler {
     for (jfrFile <- jfrFiles) {
       val converterJar = file(System.getenv("ASYNC_PROFILER_DIR")) / "build" / "converter.jar"
       val (_, si) = Project.extract(state).runTask(scalaInstance, state)
-      val run = new Run(cp => ClasspathUtilities.makeLoader(cp, si), trapExit = true)
+      val run = new Run(cp => ClasspathUtil.makeLoader(cp.map(_.toPath), si), trapExit = true)
       def jfr2flame(forward: Boolean, event: String): Unit = {
         val jfrFileNameString = jfrFile.toAbsolutePath.toString
         val flameFileName = jfrFileNameString.replaceAll(""".jfr$""", s"${if (event == "cpu") "" else "-" + event}-${if (forward) "forward" else "reverse"}.html")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.8.2