sbt 2

Author: xuwei-k

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
     - uses: sbt/setup-sbt@v1
     - name: Build and test
       shell: bash
-      run: sbt -v clean scalafmtCheckAll headerCheck test scripted
+      run: sbt -v clean "+ scalafmtCheckAll" "+ headerCheckAll" "+ test" scripted
     - name: Build site
       if: ${{ matrix.java-version == 11 }}
       shell: bash

build.sbt

@@ -26,12 +26,22 @@ lazy val jacocoPlugin = (project in file("."))
     scalacOptions ++= Seq(
       "-unchecked",
       "-deprecation",
-      "-feature",
-      "-Xfuture",
-      "-Ywarn-adapted-args",
-      "-Ywarn-dead-code"
+      "-feature"
     )
 
+    scalacOptions ++= {
+      scalaBinaryVersion.value match {
+        case "2.12" =>
+          Seq(
+            "-Xfuture",
+            "-Ywarn-adapted-args",
+            "-Ywarn-dead-code"
+          )
+        case _ =>
+          Nil
+      }
+    }
+
     buildInfoPackage := "com.github.sbt.jacoco.build"
     buildInfoKeys := Seq[BuildInfoKey](
       Test / resourceDirectory,
@@ -85,3 +95,13 @@ ThisBuild / pomIncludeRepository := { _ =>
 ThisBuild / publishTo := (if (isSnapshot.value) None else localStaging.value)
 ThisBuild / publishMavenStyle := true
 ThisBuild / dynverSonatypeSnapshots := true
+
+crossScalaVersions += "3.7.4"
+pluginCrossBuild / sbtVersion := {
+  scalaBinaryVersion.value match {
+    case "2.12" =>
+      sbtVersion.value
+    case _ =>
+      "2.0.0-RC6"
+  }
+}

…m/github/sbt/jacoco/JacocoItPlugin.scala …m/github/sbt/jacoco/JacocoItPlugin.scalasrc/main/scala/com/github/sbt/jacoco/JacocoItPlugin.scala renamed to src/main/scala-2/com/github/sbt/jacoco/JacocoItPlugin.scala src/main/scala/com/github/sbt/jacoco/JacocoItPlugin.scala renamed to src/main/scala-2/com/github/sbt/jacoco/JacocoItPlugin.scala

@@ -0,0 +1,30 @@
+/*
+ * This file is part of sbt-jacoco.
+ *
+ * Copyright (c) Joachim Hofer & contributors
+ * All rights reserved.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package com.github.sbt.jacoco
+
+import sbt.Def
+import sbt.Keys.Classpath
+
+private[jacoco] object JacocoPluginCompat {
+  def testFull = sbt.Keys.test
+
+  def convertClasspath(x: Classpath): Classpath =
+    x
+
+  def fromClasspath(x: Classpath): Classpath =
+    x
+
+  implicit class DefOps(private val self: Def.type) extends AnyVal {
+    def uncached[A](a: A): A = a
+  }
+}

src/main/scala-2/com/github/sbt/jacoco/JacocoPluginCompat.scala

@@ -0,0 +1,31 @@
+/*
+ * This file is part of sbt-jacoco.
+ *
+ * Copyright (c) Joachim Hofer & contributors
+ * All rights reserved.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package com.github.sbt.jacoco
+
+import sbt.Keys.*
+import java.io.File
+import sbt.internal.util.Attributed
+
+private[jacoco] object JacocoPluginCompat {
+  def testFull = sbt.Keys.testFull
+
+  inline def convertClasspath(x: Seq[Attributed[File]]): Classpath = {
+    val converter = fileConverter.value
+    x.map(_.map(f => converter.toVirtualFile(f.toPath)))
+  }
+
+  inline def fromClasspath(x: Classpath): Seq[Attributed[File]] = {
+    val converter = fileConverter.value
+    x.map(_.map(f => converter.toPath(f).toFile))
+  }
+}

src/main/scala-3/com/github/sbt/jacoco/JacocoPluginCompat.scala

@@ -14,6 +14,7 @@ package com.github.sbt.jacoco
 
 import java.io.File
 
+import com.github.sbt.jacoco.JacocoPluginCompat.*
 import com.github.sbt.jacoco.build.BuildInfo
 import com.github.sbt.jacoco.data.{ExecutionDataUtils, InstrumentationUtils, ProjectData}
 import com.github.sbt.jacoco.report.ReportUtils
@@ -78,7 +79,7 @@ private[jacoco] abstract class BaseJacocoPlugin extends AutoPlugin with JacocoKe
         ExecutionDataUtils
           .saveRuntimeData(projectData(thisProject.value), jacocoDataFile.value, fork.value, streams.value)
       )
-      .dependsOn(test)
+      .dependsOn(JacocoPluginCompat.testFull)
       .value,
     jacocoReport := ReportUtils.generateReport(
       jacocoReportDirectory.value,
@@ -99,19 +100,23 @@ private[jacoco] abstract class BaseJacocoPlugin extends AutoPlugin with JacocoKe
       streams.value
     ),
     clean := jacocoDirectory.map(dir => if (dir.exists) IO delete dir.listFiles).value,
-    fullClasspath := InstrumentationUtils.instrumentClasses(
-      (Compile / products).value,
-      filterClassesToInstrument(
-        (Compile / products).value,
-        (srcConfig / jacocoInstrumentationIncludes).value,
-        (srcConfig / jacocoInstrumentationExcludes).value
-      ),
-      (srcConfig / fullClasspath).value,
-      jacocoInstrumentedDirectory.value,
-      update.value,
-      fork.value,
-      projectData(thisProject.value),
-      streams.value
+    fullClasspath := Def.uncached(
+      JacocoPluginCompat.convertClasspath(
+        InstrumentationUtils.instrumentClasses(
+          (Compile / products).value,
+          filterClassesToInstrument(
+            (Compile / products).value,
+            (srcConfig / jacocoInstrumentationIncludes).value,
+            (srcConfig / jacocoInstrumentationExcludes).value
+          ),
+          JacocoPluginCompat.fromClasspath((srcConfig / fullClasspath).value),
+          jacocoInstrumentedDirectory.value,
+          update.value,
+          fork.value,
+          projectData(thisProject.value),
+          streams.value
+        )
+      )
     ),
     definedTests := (srcConfig / definedTests).value,
     definedTestNames := (srcConfig / definedTestNames).value

src/main/scala/com/github/sbt/jacoco/BaseJacocoPlugin.scala

@@ -19,16 +19,21 @@ import sbt.*
 object JacocoKeys extends JacocoKeys
 
 trait JacocoKeys {
+  @transient
   val jacoco: TaskKey[Unit] = taskKey[Unit]("Executes the tests and creates a JaCoCo coverage report.")
 
+  @transient
   val jacocoCheck: TaskKey[Unit] = taskKey[Unit]("Executes the tests and saves the execution data in 'jacoco.exec'.")
+  @transient
   val jacocoReport: TaskKey[Unit] =
     taskKey[Unit]("Generates a JaCoCo report. You can use the 'jacoco report' command alternatively.")
 
+  @transient
   val jacocoAggregate: TaskKey[Unit] = taskKey[Unit](
     "Executes the tests and creates a JaCoCo coverage report as well as an aggregated report which merges all sub-projects."
   )
 
+  @transient
   val jacocoAggregateReport: TaskKey[Unit] = taskKey[Unit]("Generates an aggregated JaCoCo report.")
 
   val jacocoDirectory: SettingKey[File] =

src/main/scala/com/github/sbt/jacoco/JacocoKeys.scala

@@ -26,7 +26,9 @@ object JacocoCoverallsPlugin extends BaseJacocoPlugin {
   override protected def srcConfig = Test
 
   object autoImport {
+    @transient
     val jacocoCoveralls: TaskKey[Unit] = taskKey("Generate and upload JaCoCo reports to Coveralls")
+    @transient
     val jacocoCoverallsGenerateReport: TaskKey[Unit] = taskKey("Generate Coveralls report JSON")
 
     val jacocoCoverallsServiceName: SettingKey[String] = settingKey("CI service name")

src/main/scala/com/github/sbt/jacoco/coveralls/JacocoCoverallsPlugin.scala

@@ -25,7 +25,7 @@ object InstrumentationUtils {
   def instrumentClasses(
       products: Seq[File],
       classFiles: Seq[File],
-      classpath: Classpath,
+      classpath: Seq[Attributed[File]],
       destDirectory: File,
       updateReport: UpdateReport,
       forked: Boolean,