Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update base scalac-scoverage version #557

Merged
merged 1 commit into from
Sep 5, 2024
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
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "sbt-scoverage"

import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts

lazy val scoverageVersion = "2.1.1"
lazy val scoverageVersion = "2.2.0"

inThisBuild(
List(
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/aggregate-disabled-module/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
inThisBuild(
List(
organization := "org.scoverage",
scalaVersion := "2.13.13",
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
scalaVersion := "2.13.14",
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
)
)

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/aggregate-only/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
lazy val commonSettings = Seq(
organization := "org.scoverage",
version := "0.1.0",
scalaVersion := "2.13.13"
scalaVersion := "2.13.14"
)

def module(name: String) = {
Expand All @@ -15,7 +15,7 @@ def module(name: String) = {
.settings(commonSettings: _*)
.settings(
Keys.name := name,
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/scoverage/aggregate/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def module(name: String) = {
.settings(commonSettings: _*)
.settings(
Keys.name := name,
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumBranchPerFile := 80

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtPerFile := 90

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumBranchPerPackage := 80

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtPerPackage := 80

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumBranchTotal := 80

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtTotal := 80

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/bad-coverage/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtTotal := 80

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/scoverage/coverage-excluded-files/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version := "0.1"

scalaVersion := "2.13.13"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/coverage-excluded-packages/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageExcludedPackages := "two\\..*;three\\..*"

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/coverage-off/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtTotal := 100
coverageMinimumBranchTotal := 100
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/good-coverage/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtTotal := 100
coverageMinimumBranchTotal := 100
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/scoverage/preserve-set/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import sbt.complete.DefaultParsers._

version := "0.1"

scalaVersion := "2.13.13"
scalaVersion := "2.13.14"

crossScalaVersions := Seq("2.13.13")
crossScalaVersions := Seq("2.13.14")

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

val checkScalaVersion = inputKey[Unit](
"Input task to compare the value of scalaVersion setting with a given input."
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/preserve-set/test
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# check scalaVersion setting
> checkScalaVersion "2.13.13"
> checkScalaVersion "2.13.14"
> checkScoverageEnabled "false"
> coverage
> checkScoverageEnabled "true"
> coverageOff
> checkScalaVersion "2.13.13"
> checkScalaVersion "2.13.14"
> checkScoverageEnabled "false"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version := "0.1"

scalaVersion := "3.5.0"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version := "0.1"

scalaVersion := "3.5.0"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageExcludedPackages := "two\\..*;three\\..*"

Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/scala3-good/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version := "0.1"

scalaVersion := "3.2.0-RC1"
scalaVersion := "3.5.0"

libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test

coverageMinimumStmtTotal := 100
coverageMinimumBranchTotal := 100
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/scoverage/scalajs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ lazy val cross =
CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatform)
.crossType(CrossType.Full)
.settings(
scalaVersion := "2.13.10",
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
scalaVersion := "2.13.14",
libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
)

lazy val crossJS = cross.js
Expand Down