Skip to content

Commit

Permalink
Disable jacoco coverage
Browse files Browse the repository at this point in the history
There is some conflict with the `sbt-java-module-info` plugin
  • Loading branch information
luben committed Oct 2, 2023
1 parent e2d3bcb commit a4dcfa3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: ldd target/classes/${{ matrix.target }}/libzstd-jni-${nativeJniVersion}.so

- name: Test
run: ./sbt jacoco
run: ./sbt test

- name: Upload coverage
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

- name: Test
if: matrix.target_arch == 'x86_64'
run: ./sbt jacoco
run: ./sbt test

- name: Upload coverage
if: matrix.target_arch == 'x86_64'
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
run: ./sbt compile

- name: Test
run: ./sbt jacoco
run: ./sbt test

- name: Upload coverage
uses: codecov/codecov-action@v3
Expand Down
8 changes: 5 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version := {
scala.io.Source.fromFile("version").getLines.next
}

scalaVersion := "2.13.8"
scalaVersion := "2.13.12"

enablePlugins(JniPlugin, SbtOsgi, ModuleInfoPlugin)
moduleInfo := com.sandinh.javamodule.moduleinfo.JpmsModule(
Expand All @@ -23,8 +23,8 @@ Test / logBuffered := false
Test / parallelExecution := false

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.13" % "test",
"org.scalatestplus" %% "scalacheck-1-16" % "3.2.13.0" % "test"
"org.scalatest" %% "scalatest" % "3.2.17" % "test",
"org.scalatestplus" %% "scalacheck-1-17" % "3.2.17.0" % "test"
)

javacOptions ++= Seq("--release", "6", "-Xlint:unchecked")
Expand Down Expand Up @@ -213,12 +213,14 @@ OsgiKeys.privatePackage := Seq(
OsgiKeys.requireCapability := "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version>=1.6))\""

// Jacoco coverage setting
/*
jacocoReportSettings := JacocoReportSettings(
"Jacoco Coverage Report",
None,
JacocoThresholds(),
Seq(JacocoReportFormats.XML, JacocoReportFormats.HTML),
"utf-8")
*/

// Android .aar
val aarTask = taskKey[File]("aar Task")
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("io.github.joprice" % "sbt-jni" % "0.2.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")
// addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")
addSbtPlugin("com.sandinh" % "sbt-java-module-info" % "0.3.0")
2 changes: 1 addition & 1 deletion src/test/scala/Zstd.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import scala.util.Using

class ZstdSpec extends AnyFlatSpec with ScalaCheckPropertyChecks {

implicit override val generatorDrivenConfig =
implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
PropertyCheckConfiguration(minSize = 0, sizeRange = 130 * 1024)

val levels = List(1, 3, 6, 9)
Expand Down

0 comments on commit a4dcfa3

Please sign in to comment.