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 @@ -32,7 +32,7 @@ inThisBuild(
lazy val root = Project("sbt-scoverage", file("."))
.enablePlugins(SbtPlugin, BuildInfoPlugin)
.settings(
crossScalaVersions += "3.6.2",
crossScalaVersions += "3.7.2",
libraryDependencies ++= Seq(
"org.scoverage" %% "scalac-scoverage-reporter" % scoverageVersion
),
Expand All @@ -41,7 +41,7 @@ lazy val root = Project("sbt-scoverage", file("."))
case "2.12" =>
(pluginCrossBuild / sbtVersion).value
case _ =>
"2.0.0-M3"
"2.0.0-RC3"
}
},
buildInfoKeys := Seq[BuildInfoKey]("scoverageVersion" -> scoverageVersion),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.11
sbt.version=1.11.5
7 changes: 7 additions & 0 deletions src/main/scala-2/scoverage/ScoverageSbtPluginCompat.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package scoverage

private[scoverage] object ScoverageSbtPluginCompat {
implicit class DefOps(private val self: sbt.Def.type) extends AnyVal {
def uncached[A](a: A): A = a
}
}
3 changes: 3 additions & 0 deletions src/main/scala-3/scoverage/ScoverageSbtPluginCompat.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package scoverage

private[scoverage] object ScoverageSbtPluginCompat
2 changes: 2 additions & 0 deletions src/main/scala/scoverage/ScoverageKeys.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ object ScoverageKeys {
lazy val coverageEnabled = settingKey[Boolean](
"controls whether code instrumentation is enabled or not"
)
@transient
lazy val coverageReport = taskKey[Unit]("run report generation")
@transient
lazy val coverageAggregate = taskKey[Unit]("aggregate reports from subprojects")
lazy val coverageExcludedPackages = settingKey[String]("regex for excluded packages")
lazy val coverageExcludedFiles = settingKey[String]("regex for excluded file paths")
Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/scoverage/ScoverageSbtPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import sbt.Keys._
import sbt.{given, _}
import sbt.internal.util.Util.isWindows
import sbt.plugins.JvmPlugin
import scoverage.ScoverageSbtPluginCompat.*
import scoverage.reporter.CoberturaXmlWriter
import scoverage.domain.Constants
import scoverage.domain.Coverage
Expand Down Expand Up @@ -122,7 +123,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
)

private lazy val scalacSettings = Seq(
Compile / compile / scalacOptions ++= {
Compile / compile / scalacOptions ++= Def.uncached {

implicit val log: Logger = streams.value.log

Expand Down