File tree Expand file tree Collapse file tree 4 files changed +17
-7
lines changed Expand file tree Collapse file tree 4 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 3232 java-version : ${{ matrix.java }}
3333
3434 - name : Run tests
35- run : sbt scripted
35+ run : sbt scripted "++ 3.x" test
3636
3737 formatting :
3838 runs-on : ubuntu-latest
5252 - uses : sbt/setup-sbt@v1
5353
5454 - name : Check Formatting
55- run : sbt scalafmtSbtCheck scalafmtCheckAll
55+ run : sbt scalafmtSbtCheck "+ scalafmtCheckAll"
Original file line number Diff line number Diff line change @@ -32,15 +32,25 @@ inThisBuild(
3232lazy val root = Project (" sbt-scoverage" , file(" ." ))
3333 .enablePlugins(SbtPlugin , BuildInfoPlugin )
3434 .settings(
35+ crossScalaVersions += " 3.3.3" ,
3536 libraryDependencies ++= Seq (
3637 " org.scoverage" %% " scalac-scoverage-reporter" % scoverageVersion
3738 ),
39+ pluginCrossBuild / sbtVersion := {
40+ scalaBinaryVersion.value match {
41+ case " 2.12" =>
42+ (pluginCrossBuild / sbtVersion).value
43+ case _ =>
44+ " 2.0.0-M2"
45+ }
46+ },
3847 buildInfoKeys := Seq [BuildInfoKey ](" scoverageVersion" -> scoverageVersion),
3948 buildInfoPackage := " scoverage" ,
4049 Test / fork := false ,
4150 Test / publishArtifact := false ,
4251 Test / parallelExecution := false ,
4352 scalacOptions := Seq (
53+ " -language:implicitConversions" ,
4454 " -unchecked" ,
4555 " -deprecation" ,
4656 " -feature" ,
Original file line number Diff line number Diff line change 1- sbt.version =1.9.9
1+ sbt.version =1.10.3
Original file line number Diff line number Diff line change 11package scoverage
22
33import sbt .Keys ._
4- import sbt ._
4+ import sbt .{ given , _ }
55import sbt .internal .util .Util .isWindows
66import sbt .plugins .JvmPlugin
77import scoverage .reporter .CoberturaXmlWriter
@@ -124,7 +124,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
124124 private lazy val scalacSettings = Seq (
125125 Compile / compile / scalacOptions ++= {
126126
127- implicit val log = streams.value.log
127+ implicit val log : Logger = streams.value.log
128128
129129 val excludedPackages =
130130 Option (coverageExcludedPackages.value.trim).filter(_.nonEmpty)
@@ -241,7 +241,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
241241
242242 private lazy val coverageReport0 = Def .task {
243243 val target = coverageDataDir.value
244- implicit val log = streams.value.log
244+ implicit val log : Logger = streams.value.log
245245
246246 log.info(s " Waiting for measurement data to sync... " )
247247 if (System .getProperty(" os.name" ).toLowerCase.contains(" windows" )) {
@@ -276,7 +276,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
276276 }
277277
278278 private lazy val coverageAggregate0 = Def .task {
279- implicit val log = streams.value.log
279+ implicit val log : Logger = streams.value.log
280280 log.info(s " Aggregating coverage from subprojects... " )
281281
282282 val dataDirs = coverageDataDir.? .all(aggregateFilter).value
You can’t perform that action at this time.
0 commit comments