support sbt 2

Author: xuwei-k

.github/workflows/ci.yml

@@ -23,4 +23,4 @@ jobs:
         java-version: ${{ matrix.java }}
         cache: sbt
     - uses: sbt/setup-sbt@v1
-    - run: sbt -v test scripted
+    - run: sbt -v "+ Test/compile" "+ test" scripted

build.sbt

@@ -21,12 +21,21 @@ val commonSettings = Seq(
     Developer("retronym", "Jason Zaugg", "<jzaugg@gmail.com>", url("https://github.com/retronym")),
     Developer("johanandren", "Johan Andrén", "<johan@markatta.com>", url("https://github.com/johanandren"))
   ),
-  crossSbtVersions := Vector("1.3.0"),
+
+  crossScalaVersions += "3.7.2",
+
+  pluginCrossBuild / sbtVersion := {
+    scalaBinaryVersion.value match {
+      case "2.12" =>
+        (pluginCrossBuild / sbtVersion).value
+      case _ =>
+        "2.0.0-RC2"
+    }
+  },
 
   scalacOptions ++= List(
     "-unchecked",
     "-deprecation",
-    "-language:_",
     "-encoding", "UTF-8"
   ),
 

plugin/src/main/scala-2/pl/project13/scala/sbt/JmhPluginCompat.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 pl.project13.scala
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package pl.project13.scala.sbt
+
+import _root_.sbt.*
+import xsbti.FileConverter
+
+private[sbt] object JmhPluginCompat {
+  def toPath(a: File): File =
+    a
+
+  def toAttributedFile(a: Attributed[File], converter: FileConverter): Attributed[File] =
+    a
+
+  implicit class DefOps(private val self: _root_.sbt.Def.type) extends AnyVal {
+    def uncached[A](a: A): A = a
+  }
+}

plugin/src/main/scala-3/pl/project13/scala/sbt/JmhPluginCompat.scala

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014 pl.project13.scala
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package pl.project13.scala.sbt
+
+import java.nio.file.{ Path => NioPath }
+import _root_.sbt.*
+import xsbti.{ FileConverter, HashedVirtualFileRef }
+
+private[sbt] object JmhPluginCompat {
+  def toPath(a: File): NioPath =
+    a.toPath
+
+  def toAttributedFile(a: Attributed[HashedVirtualFileRef], converter: FileConverter): Attributed[File] =
+    a.map(converter.toPath(_).toFile)
+}

plugin/src/main/scala/pl/project13/scala/sbt/JmhPlugin.scala

@@ -18,6 +18,9 @@ package pl.project13.scala.sbt
 
 import sbt.*
 import sbt.Keys.*
+import sjsonnew.BasicJsonProtocol.*
+import pl.project13.scala.sbt.JmhPluginCompat.*
+import xsbti.FileConverter
 
 import java.util.Properties
 
@@ -51,13 +54,23 @@ object JmhPlugin extends AutoPlugin {
     run / fork := true, // makes sure that sbt manages classpath for JMH when forking
     // allow users to configure another classesDirectory like e.g. test:classDirectory
     classDirectory := (Compile / classDirectory).value,
-    dependencyClasspath := (Compile / dependencyClasspath).value,
+    dependencyClasspath := Def.uncached((Compile / dependencyClasspath).value),
 
     resourceDirectory := (Compile / resourceDirectory).value,
     sourceGenerators := Seq(Def.task { generateJmhSourcesAndResources.value._1 }.taskValue),
     resourceGenerators := Seq(Def.task { generateJmhSourcesAndResources.value._2 }.taskValue),
-    generateJmhSourcesAndResources := generateBenchmarkSourcesAndResources(streams.value, crossTarget.value / "jmh-cache", (Jmh / classDirectory).value, sourceManaged.value, resourceManaged.value, generatorType.value, (Jmh / dependencyClasspath).value, new ForkRun(ForkOptions())),
-    generateJmhSourcesAndResources := (generateJmhSourcesAndResources dependsOn(Compile / compile)).value,
+    generateJmhSourcesAndResources := Def.uncached {
+      generateBenchmarkSourcesAndResources(
+        streams.value,
+        crossTarget.value / "jmh-cache",
+        (Jmh / classDirectory).value, sourceManaged.value,
+        resourceManaged.value,
+        generatorType.value,
+        (Jmh / dependencyClasspath).value.map(JmhPluginCompat.toAttributedFile(_, fileConverter.value)),
+        new ForkRun(ForkOptions())
+      )
+    },
+    generateJmhSourcesAndResources := generateJmhSourcesAndResources.dependsOn(Compile / compile).value,
 
     // local copy of https://github.com/sbt/sbt/blob/e4231ac03903e174bc9975ee00d34064a1d1f373/main/src/main/scala/sbt/Keys.scala#L400
     // so that it does not break on sbt version below 1.4.0
@@ -90,7 +103,7 @@ object JmhPlugin extends AutoPlugin {
   }
 
   private def generateBenchmarkSourcesAndResources(s: TaskStreams, cacheDir: File, bytecodeDir: File, sourceDir: File, resourceDir: File, generatorType: String, classpath: Seq[Attributed[File]], run: ScalaRun): (Seq[File], Seq[File]) = {
-    val inputs: Set[File] = (bytecodeDir ** "*").filter(_.isFile).get.toSet
+    val inputs: Set[File] = (bytecodeDir ** "*").filter(_.isFile).get().toSet
     val cachedGeneration = FileFunction.cached(cacheDir, FilesInfo.hash) { _ =>
       // ignore change report and rebuild it completely
       internalGenerateBenchmarkSourcesAndResources(s, bytecodeDir, sourceDir, resourceDir, generatorType, classpath, run, s.log)
@@ -109,7 +122,7 @@ object JmhPlugin extends AutoPlugin {
 
     val mainClass = "org.openjdk.jmh.generators.bytecode.JmhBytecodeGenerator"
     val options = Seq(bytecodeDir, sourceDir, resourceDir, generatorType).map(_.toString)
-    run.run(mainClass, classpath.map(_.data), options, log).get
-    ((sourceDir ** "*").filter(_.isFile) +++ (resourceDir ** "*").filter(_.isFile)).get.toSet
+    run.run(mainClass, classpath.map(x => JmhPluginCompat.toPath(x.data)), options, log).get
+    ((sourceDir ** "*").filter(_.isFile) +++ (resourceDir ** "*").filter(_.isFile)).get().toSet
   }
 }