File tree 4 files changed +17
-7
lines changed
4 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 32
32
java-version : ${{ matrix.java }}
33
33
34
34
- name : Run tests
35
- run : sbt scripted
35
+ run : sbt scripted "++ 3.x" test
36
36
37
37
formatting :
38
38
runs-on : ubuntu-latest
52
52
- uses : sbt/setup-sbt@v1
53
53
54
54
- 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(
32
32
lazy val root = Project (" sbt-scoverage" , file(" ." ))
33
33
.enablePlugins(SbtPlugin , BuildInfoPlugin )
34
34
.settings(
35
+ crossScalaVersions += " 3.3.3" ,
35
36
libraryDependencies ++= Seq (
36
37
" org.scoverage" %% " scalac-scoverage-reporter" % scoverageVersion
37
38
),
39
+ pluginCrossBuild / sbtVersion := {
40
+ scalaBinaryVersion.value match {
41
+ case " 2.12" =>
42
+ (pluginCrossBuild / sbtVersion).value
43
+ case _ =>
44
+ " 2.0.0-M2"
45
+ }
46
+ },
38
47
buildInfoKeys := Seq [BuildInfoKey ](" scoverageVersion" -> scoverageVersion),
39
48
buildInfoPackage := " scoverage" ,
40
49
Test / fork := false ,
41
50
Test / publishArtifact := false ,
42
51
Test / parallelExecution := false ,
43
52
scalacOptions := Seq (
53
+ " -language:implicitConversions" ,
44
54
" -unchecked" ,
45
55
" -deprecation" ,
46
56
" -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 1
1
package scoverage
2
2
3
3
import sbt .Keys ._
4
- import sbt ._
4
+ import sbt .{ given , _ }
5
5
import sbt .internal .util .Util .isWindows
6
6
import sbt .plugins .JvmPlugin
7
7
import scoverage .reporter .CoberturaXmlWriter
@@ -124,7 +124,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
124
124
private lazy val scalacSettings = Seq (
125
125
Compile / compile / scalacOptions ++= {
126
126
127
- implicit val log = streams.value.log
127
+ implicit val log : Logger = streams.value.log
128
128
129
129
val excludedPackages =
130
130
Option (coverageExcludedPackages.value.trim).filter(_.nonEmpty)
@@ -241,7 +241,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
241
241
242
242
private lazy val coverageReport0 = Def .task {
243
243
val target = coverageDataDir.value
244
- implicit val log = streams.value.log
244
+ implicit val log : Logger = streams.value.log
245
245
246
246
log.info(s " Waiting for measurement data to sync... " )
247
247
if (System .getProperty(" os.name" ).toLowerCase.contains(" windows" )) {
@@ -276,7 +276,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
276
276
}
277
277
278
278
private lazy val coverageAggregate0 = Def .task {
279
- implicit val log = streams.value.log
279
+ implicit val log : Logger = streams.value.log
280
280
log.info(s " Aggregating coverage from subprojects... " )
281
281
282
282
val dataDirs = coverageDataDir.? .all(aggregateFilter).value
You can’t perform that action at this time.
0 commit comments