diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3217e41..b6c9fb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.15, 2.12.20, 3.3.4] + scala: [2.13.16, 2.12.20, 3.3.4] java: [temurin@21] runs-on: ${{ matrix.os }} steps: @@ -72,7 +72,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.15] + scala: [2.13.16] java: [temurin@21] runs-on: ${{ matrix.os }} steps: @@ -92,12 +92,12 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Download target directories (2.13.15) + - name: Download target directories (2.13.16) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.16-${{ matrix.java }} - - name: Inflate target directories (2.13.15) + - name: Inflate target directories (2.13.16) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 32aa488..0fb710f 100644 --- a/build.sbt +++ b/build.sbt @@ -4,26 +4,25 @@ import ReleaseTransformations._ name := "weaver-test-extra" ThisBuild / organization := "io.github.dimitarg" -ThisBuild / scalaVersion := "2.13.15" -ThisBuild / crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") -ThisBuild / githubWorkflowScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") +ThisBuild / scalaVersion := "2.13.16" +ThisBuild / crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.4") +ThisBuild / githubWorkflowScalaVersions := Seq("2.13.16", "2.12.20", "3.3.4") -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21")) ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( commands = List("scalafmtCheck") ), WorkflowStep.Sbt( - // scoverage plugin not yet supporting scala 2.13.15 + // scoverage plugin not yet supporting scala 2.13.16 // commands = List("coverage", "test"), commands = List("test"), - env = Map( - "HONEYCOMB_WRITE_KEY" -> "${{ secrets.HONEYCOMB_WRITE_KEY }}", + "HONEYCOMB_WRITE_KEY" -> "${{ secrets.HONEYCOMB_WRITE_KEY }}" ) - ), - // scoverage plugin not yet supporting scala 2.13.15 + ) + // scoverage plugin not yet supporting scala 2.13.16 // WorkflowStep.Sbt(List("coverageReport")), ) ThisBuild / githubWorkflowEnv += "CODECOV_TOKEN" -> "${{ secrets.CODECOV_TOKEN }}" @@ -34,22 +33,23 @@ ThisBuild / githubWorkflowEnv += "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PA ThisBuild / githubWorkflowTargetBranches := Seq("master") ThisBuild / githubWorkflowPublishTargetBranches += RefPredicate.Equals(Ref.Branch("master")) - ThisBuild / licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apache-2.0")) -// scoverage plugin not yet supporting scala 2.13.15 +// scoverage plugin not yet supporting scala 2.13.16 // ThisBuild / githubWorkflowBuildPostamble := Seq(WorkflowStep.Run( // commands = List("bash <(curl -s https://codecov.io/bash)") // )) -ThisBuild / githubWorkflowPublishPreamble := Seq(WorkflowStep.Run( - List( - "git config user.name \"Github Actions (dimitarg/weaver-test-extra)\"", - "git config user.email \"dimitar.georgiev.bg@gmail.com\"", - "gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 7A723A868B1FD65C8108ACAF00437AAD7A33298A", - "echo $PGP_SECRET | base64 --decode --ignore-garbage | gpg --batch --passphrase $PGP_PASSPHRASE --import" +ThisBuild / githubWorkflowPublishPreamble := Seq( + WorkflowStep.Run( + List( + "git config user.name \"Github Actions (dimitarg/weaver-test-extra)\"", + "git config user.email \"dimitar.georgiev.bg@gmail.com\"", + "gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 7A723A868B1FD65C8108ACAF00437AAD7A33298A", + "echo $PGP_SECRET | base64 --decode --ignore-garbage | gpg --batch --passphrase $PGP_PASSPHRASE --import" + ) ) -)) +) ThisBuild / githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("release cross with-defaults"))) @@ -58,16 +58,14 @@ val weaverVersion = "0.8.4" val natchezVersion = "0.3.7" val fs2Version = "3.11.0" -libraryDependencies ++=Seq( +libraryDependencies ++= Seq( "com.disneystreaming" %% "weaver-scalacheck" % weaverVersion, "com.disneystreaming" %% "weaver-cats" % weaverVersion, "org.tpolecat" %% "natchez-core" % natchezVersion, - "org.tpolecat" %% "natchez-noop" % natchezVersion % "test", "org.tpolecat" %% "natchez-honeycomb" % natchezVersion % "test", - "co.fs2" %% "fs2-io" % fs2Version % "test", -) - + "co.fs2" %% "fs2-io" % fs2Version % "test" +) testFrameworks += new TestFramework("weaver.framework.CatsEffect") @@ -85,7 +83,7 @@ libraryDependencies ++= { ThisBuild / scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12 | 13)) => Seq("-Xsource:3-cross", "-P:kind-projector:underscore-placeholders") - case _ => Nil + case _ => Nil } } @@ -102,7 +100,12 @@ ThisBuild / publishMavenStyle := true sonatypeProjectHosting := Some(GitHubHosting("dimitarg", "weaver-test-extra", "dimitar.georgiev.bg@gmail.com")) developers := List( - Developer(id="dimitarg", name="Dimitar Georgiev", email="dimitar.georgiev.bg@gmail.com", url=url("https://dimitarg.github.io/")) + Developer( + id = "dimitarg", + name = "Dimitar Georgiev", + email = "dimitar.georgiev.bg@gmail.com", + url = url("https://dimitarg.github.io/") + ) ) releaseCrossBuild := true // true if you cross-build the project for multiple Scala versions diff --git a/project/plugins.sbt b/project/plugins.sbt index 7908d1e..cef06c6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") -// scoverage plugin not yet supporting scala 2.13.15 +// scoverage plugin not yet supporting scala 2.13.16 // addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")