diff --git a/CHANGELOG.md b/CHANGELOG.md index eb4e300..1de49a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ This project uses [Semantic Versioning](https://semver.org/). ## [Unreleased] +## [2.5.0] — 2026-09-01 + ### Fixed - **sbt plugin restored to sbt 1.x compatibility.** v2.4.0 used the 3-arg @@ -14,7 +16,8 @@ This project uses [Semantic Versioning](https://semver.org/). `java.lang.NoSuchMethodError: sbt.Command$.process(...)`. Switched back to the 2-arg overload and pinned `pluginCrossBuild / sbtVersion` to `1.9.0` so the plugin can no longer compile against newer-than-1.9 sbt APIs. - ([#76](https://github.com/MoranaApps/jacoco-method-filter/issues/76)) + ([#76](https://github.com/MoranaApps/jacoco-method-filter/issues/76), + [#77](https://github.com/MoranaApps/jacoco-method-filter/pull/77)) ## [2.4.0] — 2026-09-01 @@ -151,7 +154,8 @@ This project uses [Semantic Versioning](https://semver.org/). - Rule syntax: `#()` with glob patterns. - `@CoverageGenerated` annotation injection. -[Unreleased]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.4.0...HEAD +[Unreleased]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.5.0...HEAD +[2.5.0]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.4.0...v2.5.0 [2.4.0]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.3.0...v2.4.0 [2.3.0]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.2.0...v2.3.0 [2.2.0]: https://github.com/MoranaApps/jacoco-method-filter/compare/v2.1.1...v2.2.0 diff --git a/DEVELOPER.md b/DEVELOPER.md index 0c93cdc..a7ba639 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -49,11 +49,11 @@ Artifacts will appear in: ```scala // project/plugins.sbt resolvers += Resolver.defaultLocal -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") // build.sbt enablePlugins(morana.coverage.JacocoFilterPlugin) -libraryDependencies += "io.github.moranaapps" %% "jacoco-method-filter-core" % "2.4.0" +libraryDependencies += "io.github.moranaapps" %% "jacoco-method-filter-core" % "2.5.0" ``` #### Maven (local snapshot) @@ -74,7 +74,7 @@ libraryDependencies += "io.github.moranaapps" %% "jacoco-method-filter-core" % " io.github.moranaapps jacoco-method-filter-core_2.13 - 2.4.0 + 2.5.0 ``` diff --git a/RELEASE.md b/RELEASE.md index 4c56602..f04691f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -58,16 +58,17 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") **Integration-test fixtures** (must match the version being released so CI runs against the new artifacts): 6. `integration-tests/fixtures/sbt-basic/project/plugins.sbt` 7. `integration-tests/fixtures/sbt-scala211/project/plugins.sbt` - 8. `integration-tests/test-maven-report-custom.sh` — inline `` in the generated `pom-custom.xml` + 8. `integration-tests/fixtures/sbt-19x/project/plugins.sbt` + 9. `integration-tests/test-maven-report-custom.sh` — inline `` in the generated `pom-custom.xml` **Docs & defaults** (user-facing references to the current version): - 9. `sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala` — `jmfCoreVersion` default - 10. `DEVELOPER.md` — install snippets - 11. `sbt-plugin/README.md` — install snippet - 12. `maven-plugin/README.md` — install snippets + 10. `sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala` — `jmfCoreVersion` default + 11. `DEVELOPER.md` — install snippets + 12. `sbt-plugin/README.md` — install snippet + 13. `maven-plugin/README.md` — install snippets **Changelog**: - 13. `CHANGELOG.md` — rename `## [Unreleased]` to `## [] — `, add a fresh empty + 14. `CHANGELOG.md` — rename `## [Unreleased]` to `## [] — `, add a fresh empty `## [Unreleased]`, and update the link references at the bottom (`[Unreleased]`, new `[]`). - Use [semantic versioning](https://semver.org/). @@ -157,6 +158,7 @@ git push origin master `examples/maven-scala/pom.xml` (examples) - [ ] Version updated in `integration-tests/fixtures/sbt-basic/project/plugins.sbt`, `integration-tests/fixtures/sbt-scala211/project/plugins.sbt`, + `integration-tests/fixtures/sbt-19x/project/plugins.sbt`, `integration-tests/test-maven-report-custom.sh` (integration-test fixtures) - [ ] Version updated in `sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala` (`jmfCoreVersion` default), `DEVELOPER.md`, `sbt-plugin/README.md`, `maven-plugin/README.md` (docs) diff --git a/build.sbt b/build.sbt index fc6152f..291d1c2 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtassembly.AssemblyPlugin.autoImport._ ThisBuild / organization := "io.github.moranaapps" ThisBuild / scalaVersion := "2.12.21" // default ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.21", "2.13.13") -ThisBuild / version := "2.4.0" +ThisBuild / version := "2.5.0" ThisBuild / versionScheme := Some("early-semver") // Central (bundle flow) diff --git a/examples/maven-basic/pom.xml b/examples/maven-basic/pom.xml index 614fe4f..eb232f6 100644 --- a/examples/maven-basic/pom.xml +++ b/examples/maven-basic/pom.xml @@ -78,7 +78,7 @@ io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 diff --git a/examples/maven-scala/pom.xml b/examples/maven-scala/pom.xml index 93e547d..d752375 100644 --- a/examples/maven-scala/pom.xml +++ b/examples/maven-scala/pom.xml @@ -111,7 +111,7 @@ io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 diff --git a/examples/sbt-basic/project/plugins.sbt b/examples/sbt-basic/project/plugins.sbt index a5e9702..7760007 100644 --- a/examples/sbt-basic/project/plugins.sbt +++ b/examples/sbt-basic/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") diff --git a/integration-tests/fixtures/sbt-19x/project/plugins.sbt b/integration-tests/fixtures/sbt-19x/project/plugins.sbt index 530fe1a..d4b20e1 100644 --- a/integration-tests/fixtures/sbt-19x/project/plugins.sbt +++ b/integration-tests/fixtures/sbt-19x/project/plugins.sbt @@ -1,3 +1,3 @@ // CI fixture: verifies the plugin loads and runs on sbt 1.9.x (the 3-arg // Command.process overload used up to v2.4.0 only exists in sbt >= 1.10.0). -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") diff --git a/integration-tests/fixtures/sbt-basic/project/plugins.sbt b/integration-tests/fixtures/sbt-basic/project/plugins.sbt index 10515a4..63d3085 100644 --- a/integration-tests/fixtures/sbt-basic/project/plugins.sbt +++ b/integration-tests/fixtures/sbt-basic/project/plugins.sbt @@ -1,4 +1,4 @@ // CI fixture: plugin dependency is enabled (unlike examples/sbt-basic where it is // commented out for safe cloning). Integration tests copy this directory instead // of using fragile sed-based uncommenting. -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") diff --git a/integration-tests/fixtures/sbt-scala211/project/plugins.sbt b/integration-tests/fixtures/sbt-scala211/project/plugins.sbt index ba5835c..12fd4b7 100644 --- a/integration-tests/fixtures/sbt-scala211/project/plugins.sbt +++ b/integration-tests/fixtures/sbt-scala211/project/plugins.sbt @@ -1,2 +1,2 @@ // Reference local publish of jacoco-method-filter-sbt plugin -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") diff --git a/integration-tests/test-maven-report-custom.sh b/integration-tests/test-maven-report-custom.sh index b0f7b50..ca39d5e 100755 --- a/integration-tests/test-maven-report-custom.sh +++ b/integration-tests/test-maven-report-custom.sh @@ -87,7 +87,7 @@ cat > pom-custom.xml << 'EOF' io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 filter-coverage diff --git a/maven-plugin/README.md b/maven-plugin/README.md index 12143be..934e00f 100644 --- a/maven-plugin/README.md +++ b/maven-plugin/README.md @@ -18,7 +18,7 @@ Maven plugin for filtering JaCoCo coverage by annotating methods based on config - Java 8 or higher - Maven 3.6 or higher -- `jacoco-method-filter-core_2.12:2.4.0` dependency (automatically included) +- `jacoco-method-filter-core_2.12:2.5.0` dependency (automatically included) - JaCoCo CLI 0.8.15 (automatically included) ## Implementation Details @@ -60,7 +60,7 @@ Add to your `pom.xml` (recommended: inside a coverage profile): io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 @@ -156,7 +156,7 @@ Rewrites compiled class files to add `@CoverageGenerated` annotations to methods io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 @@ -173,7 +173,7 @@ Rewrites compiled class files to add `@CoverageGenerated` annotations to methods io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 https://example.com/team-rules.txt ${project.basedir}/jmf-rules.txt @@ -258,7 +258,7 @@ Generates JaCoCo coverage reports (HTML, XML, CSV) using filtered classes. io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 report diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index a2c16ab..a31d41a 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.github.moranaapps jacoco-method-filter-maven-plugin - 2.4.0 + 2.5.0 maven-plugin JaCoCo Method Filter Maven Plugin @@ -70,7 +70,7 @@ io.github.moranaapps jacoco-method-filter-core_2.12 - 2.4.0 + 2.5.0 diff --git a/sbt-plugin/README.md b/sbt-plugin/README.md index 24761f7..928cf25 100644 --- a/sbt-plugin/README.md +++ b/sbt-plugin/README.md @@ -35,7 +35,7 @@ The plugin executes the coverage flow by: Add to `project/plugins.sbt`: ```scala -addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.4.0") +addSbtPlugin("io.github.moranaapps" % "jacoco-method-filter-sbt" % "2.5.0") ``` Enable the plugin in your `build.sbt`: diff --git a/sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala b/sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala index 2f5a982..23af41f 100644 --- a/sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala +++ b/sbt-plugin/src/main/scala/morana/coverage/JacocoFilterPlugin.scala @@ -110,7 +110,7 @@ object JacocoFilterPlugin extends AutoPlugin { // ---- defaults + coordinates jacocoVersion := "0.8.15", - jmfCoreVersion := "2.4.0", + jmfCoreVersion := "2.5.0", libraryDependencies ++= Seq( ("org.jacoco" % "org.jacoco.agent" % jacocoVersion.value % Test).classifier("runtime"), ("org.jacoco" % "org.jacoco.cli" % jacocoVersion.value % Test).classifier("nodeps"),