Skip to content

Commit 9be16a4

Browse files
committed
update sbt
1 parent f7d789f commit 9be16a4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ lazy val compilation = addJmh(project).settings(
5858
else scalaOrganization.value % "scala-compiler" % scalaVersion.value
5959
},
6060
crossScalaVersions := List(scala212, dottyLatest),
61-
unmanagedSourceDirectories.in(Compile) +=
62-
sourceDirectory.in(Compile).value / (if (isDotty.value) "dotc" else "scalac"),
61+
Compile / unmanagedSourceDirectories +=
62+
(Compile / sourceDirectory).value / (if (isDotty.value) "dotc" else "scalac"),
6363
Jmh / run / mainClass := Some("scala.bench.ScalacBenchmarkRunner"),
6464
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
6565
Test / testOptions += Tests.Argument(TestFrameworks.JUnit),

project/Profilers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.io.File
66
import sbt._
77
import sbt.complete.DefaultParsers.OptSpace
88
import sbt.complete.Parser
9-
import sbt.internal.inc.classpath.ClasspathUtilities
9+
import sbt.internal.inc.classpath.ClasspathUtil
1010

1111
import java.util.stream.Collectors
1212

@@ -32,7 +32,7 @@ object Profiler {
3232
for (jfrFile <- jfrFiles) {
3333
val converterJar = file(System.getenv("ASYNC_PROFILER_DIR")) / "build" / "converter.jar"
3434
val (_, si) = Project.extract(state).runTask(scalaInstance, state)
35-
val run = new Run(cp => ClasspathUtilities.makeLoader(cp, si), trapExit = true)
35+
val run = new Run(cp => ClasspathUtil.makeLoader(cp.map(_.toPath), si), trapExit = true)
3636
def jfr2flame(forward: Boolean, event: String): Unit = {
3737
val jfrFileNameString = jfrFile.toAbsolutePath.toString
3838
val flameFileName = jfrFileNameString.replaceAll(""".jfr$""", s"${if (event == "cpu") "" else "-" + event}-${if (forward) "forward" else "reverse"}.html")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.13
1+
sbt.version=1.8.2

0 commit comments

Comments
 (0)