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

Remove unnecessary jsr305 dependency #774

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
25 changes: 12 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ inThisBuild(

val CatsEffectVersion = "3.3.14"

scalafmtOnCompile in ThisBuild := true
ThisBuild / scalafmtOnCompile := true

lazy val root: Project = Project(id = "scalacache", base = file("."))
.enablePlugins(SonatypeCiReleasePlugin)
Expand Down Expand Up @@ -52,7 +52,7 @@ lazy val core =
"org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0"
)
} else Nil),
coverageMinimum := 60,
coverageMinimumStmtTotal := 60,
coverageFailOnMinimum := true
)

Expand All @@ -77,18 +77,17 @@ lazy val redis = createModule("redis")
libraryDependencies ++= Seq(
"redis.clients" % "jedis" % "3.7.1"
),
coverageMinimum := 56,
coverageMinimumStmtTotal := 56,
coverageFailOnMinimum := true
)

lazy val caffeine = createModule("caffeine")
.settings(
libraryDependencies ++= Seq(
"com.github.ben-manes.caffeine" % "caffeine" % "3.0.6",
"org.typelevel" %% "cats-effect-testkit" % CatsEffectVersion % Test,
"com.google.code.findbugs" % "jsr305" % "3.0.2" % Provided
"org.typelevel" %% "cats-effect-testkit" % CatsEffectVersion % Test
),
coverageMinimum := 80,
coverageMinimumStmtTotal := 80,
coverageFailOnMinimum := true
)

Expand All @@ -101,7 +100,7 @@ lazy val circe = createModule("circe")
scalacheck,
scalatestplus
),
coverageMinimum := 80,
coverageMinimumStmtTotal := 80,
coverageFailOnMinimum := true
)

Expand All @@ -124,7 +123,7 @@ lazy val docs = createModule("docs")
micrositeGitterChannel := true,
micrositeTwitterCreator := "@cbirchall",
micrositeShareOnSocial := true,
mdocIn := (sourceDirectory in Compile).value / "mdoc"
mdocIn := (Compile / sourceDirectory).value / "mdoc"
)
.dependsOn(
core,
Expand All @@ -139,9 +138,9 @@ lazy val benchmarks = createModule("benchmarks")
.settings(
githubWorkflowArtifactUpload := false,
publishArtifact := false,
fork in (Compile, run) := true,
javaOptions in Jmh ++= Seq("-server", "-Xms2G", "-Xmx2G", "-XX:+UseG1GC", "-XX:-UseBiasedLocking"),
javaOptions in (Test, run) ++= Seq(
Compile / run / fork := true,
Jmh / javaOptions ++= Seq("-server", "-Xms2G", "-Xmx2G", "-XX:+UseG1GC", "-XX:-UseBiasedLocking"),
Test / run / javaOptions ++= Seq(
"-XX:+UnlockCommercialFeatures",
"-XX:+FlightRecorder",
"-XX:StartFlightRecording=delay=20s,duration=60s,filename=memoize.jfr",
Expand All @@ -165,11 +164,11 @@ lazy val commonSettings =
Seq(
organization := "com.github.cb372",
scalacOptions ++= Seq("-language:higherKinds", "-language:postfixOps"),
parallelExecution in Test := false
Test / parallelExecution := false
)

lazy val mavenSettings = Seq(
publishArtifact in Test := false,
Test / publishArtifact := false,
pomIncludeRepository := { _ =>
false
}
Expand Down