Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ lazy val zincBenchmarks = (projectMatrix in internalPath / "zinc-benchmarks")
sourceDirectory := (Test / sourceDirectory).value,
classDirectory := (Test / classDirectory).value,
dependencyClasspath := (Test / dependencyClasspath).value,
// rewire tasks, so that 'jmh:run' automatically invokes 'jmh:compile' (otherwise a clean 'jmh:run' would fail)
// rewire tasks, so that 'Jmh/run' automatically invokes 'Jmh/compile' (otherwise a clean 'Jmh/run' would fail)
compile := compile.dependsOn(Test / compile).value,
run := run.dependsOn(Test / compile).evaluated,
)
Expand Down Expand Up @@ -643,7 +643,7 @@ addCommandAlias(
s"${compilerBridge213.id}/packageBin",
s"${compilerBridge212.id}/packageBin",
s"${zincBenchmarks.jvm(scala3).id}/Test/run $dir $pattern",
s"${zincBenchmarks.jvm(scala3).id}/jmh:run -p _tempDir=$dir -prof gc -foe true $pattern",
s"${zincBenchmarks.jvm(scala3).id}/Jmh/run -p _tempDir=$dir -prof gc -foe true $pattern",
s"""eval IO.delete(file("$dir"))""",
).mkString(";", ";", "")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,17 @@ private[xsbt] object ZincBenchmark {
|// This task is instrumented by the benchmarks in the Zinc compiler
|lazy val `$taskName` =
| taskKey[Unit]("Get source files and classpath of subprojects")
|`$taskName` in ThisBuild := `$taskName-impl`.value
|ThisBuild / `$taskName` := `$taskName-impl`.value
|lazy val `$taskName-impl` = Def.taskDyn {
| // Resolve project dynamically to avoid name clashes/overloading
| val project = LocalProject("$sbtProject")
| Def.task {
| val file = new File("${outputFile.getAbsolutePath.replace("\\", "/")}")
| val rawSources = (sources in Compile in project).value
| val rawSources = (project / Compile / sources).value
| val sourcesLine = rawSources.map(_.getCanonicalPath).mkString(" ")
| val rawClasspath = (dependencyClasspath in Compile in project).value
| val rawClasspath = (project / Compile / dependencyClasspath).value
| val classpathLine = rawClasspath.map(_.data.getCanonicalPath).mkString(java.io.File.pathSeparator)
| val optionsLine = (scalacOptions in Compile in project).value.mkString(" ")
| val optionsLine = (project / Compile / scalacOptions).value.mkString(" ")
| IO.writeLines(file, Seq(sourcesLine, classpathLine, optionsLine))
| }
|}
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
classDirectory in Compile := file("classes")
Compile / classDirectory := file("classes")
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scalaSource in Compile := baseDirectory.value / "src"
Compile / scalaSource := baseDirectory.value / "src"
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scalaSource in Compile := file("src")
Compile / scalaSource := file("src")
2 changes: 1 addition & 1 deletion zinc/src/sbt-test/source-dependencies/type-alias/build.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
logLevel in compile := Level.Debug
compile / logLevel := Level.Debug

incOptions := incOptions.value.withNameHashing(true)
Loading