From 222e5eb7fc2072611dd65a95ef85b3bb71d5077d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2026 13:15:24 +0000 Subject: [PATCH 1/2] Update dependency jacoco to v0.8.16 --- buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts index 84605fd9e..ab0cd6ffb 100644 --- a/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts +++ b/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts @@ -4,7 +4,7 @@ plugins { } jacoco { - toolVersion = "0.8.15" + toolVersion = "0.8.16" } tasks.jacocoTestReport { From 282fbf486bfe13e197adc09ca513d0eccc01ac6c Mon Sep 17 00:00:00 2001 From: Florian Dreier Date: Mon, 26 Oct 2026 14:38:01 +0100 Subject: [PATCH 2/2] Fix after JaCoCo update --- CHANGELOG.md | 1 + .../teamscale/jacoco/agent/JaCoCoPreMain.java | 18 +++++++++--------- .../jacoco/agent/LenientCoverageTransformer.kt | 8 ++++---- .../kotlin/com.teamscale.coverage.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fde6e1b5..f8d214e3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ We use [semantic versioning](http://semver.org/): - PATCH version when you make backwards compatible bug fixes. # Next version +- [feature] _agent_: Added official support for Java 27 and experimental support for Java 28 (via JaCoCo 0.8.16) - [fix] _teamscale-maven-plugin_: `prepare-tia-unit-test` and `prepare-tia-integration-test` no longer require a commit or revision when `runImpacted` is `false`. - [fix] _teamscale-gradle-plugin_, _teamscale-maven-plugin_: Testwise coverage reports no longer drop a class directory that contains an archive (JAR, WAR, EAR, ZIP) that contains a JAR. diff --git a/agent/src/main/java/com/teamscale/jacoco/agent/JaCoCoPreMain.java b/agent/src/main/java/com/teamscale/jacoco/agent/JaCoCoPreMain.java index 87219cf5b..887c5d5d9 100644 --- a/agent/src/main/java/com/teamscale/jacoco/agent/JaCoCoPreMain.java +++ b/agent/src/main/java/com/teamscale/jacoco/agent/JaCoCoPreMain.java @@ -13,15 +13,15 @@ package com.teamscale.jacoco.agent; -import org.jacoco.agent.rt.internal_bac9136.Agent; -import org.jacoco.agent.rt.internal_bac9136.AgentModule; -import org.jacoco.agent.rt.internal_bac9136.CoverageTransformer; -import org.jacoco.agent.rt.internal_bac9136.IExceptionLogger; -import org.jacoco.agent.rt.internal_bac9136.PreMain; -import org.jacoco.agent.rt.internal_bac9136.core.runtime.AgentOptions; -import org.jacoco.agent.rt.internal_bac9136.core.runtime.IRuntime; -import org.jacoco.agent.rt.internal_bac9136.core.runtime.InjectedClassRuntime; -import org.jacoco.agent.rt.internal_bac9136.core.runtime.ModifiedSystemClassRuntime; +import org.jacoco.agent.rt.internal_0d33b58.Agent; +import org.jacoco.agent.rt.internal_0d33b58.AgentModule; +import org.jacoco.agent.rt.internal_0d33b58.CoverageTransformer; +import org.jacoco.agent.rt.internal_0d33b58.IExceptionLogger; +import org.jacoco.agent.rt.internal_0d33b58.PreMain; +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.AgentOptions; +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.IRuntime; +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.InjectedClassRuntime; +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.ModifiedSystemClassRuntime; import org.slf4j.Logger; import java.lang.instrument.Instrumentation; diff --git a/agent/src/main/kotlin/com/teamscale/jacoco/agent/LenientCoverageTransformer.kt b/agent/src/main/kotlin/com/teamscale/jacoco/agent/LenientCoverageTransformer.kt index bd1c94757..5ad780ed6 100644 --- a/agent/src/main/kotlin/com/teamscale/jacoco/agent/LenientCoverageTransformer.kt +++ b/agent/src/main/kotlin/com/teamscale/jacoco/agent/LenientCoverageTransformer.kt @@ -1,9 +1,9 @@ package com.teamscale.jacoco.agent -import org.jacoco.agent.rt.internal_bac9136.CoverageTransformer -import org.jacoco.agent.rt.internal_bac9136.IExceptionLogger -import org.jacoco.agent.rt.internal_bac9136.core.runtime.AgentOptions -import org.jacoco.agent.rt.internal_bac9136.core.runtime.IRuntime +import org.jacoco.agent.rt.internal_0d33b58.CoverageTransformer +import org.jacoco.agent.rt.internal_0d33b58.IExceptionLogger +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.AgentOptions +import org.jacoco.agent.rt.internal_0d33b58.core.runtime.IRuntime import org.slf4j.Logger import java.lang.instrument.IllegalClassFormatException import java.security.ProtectionDomain diff --git a/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts b/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts index ab0cd6ffb..545b484fa 100644 --- a/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts +++ b/buildSrc/src/main/kotlin/com.teamscale.coverage.gradle.kts @@ -4,7 +4,7 @@ plugins { } jacoco { - toolVersion = "0.8.16" + toolVersion = versionCatalogs.named("libs").findVersion("jacoco").get().requiredVersion } tasks.jacocoTestReport { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 797482b4a..3b2cc1209 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # When upgrading JaCoCo to a newer version, make sure to # check the comment in the OpenAnalyzer.java, JaCoCoPreMain.java and CachingInstructionsBuilder.java # and update the internal_xxxxxx hash included in the imports in LenientCoverageTransformer.java and JaCoCoPreMain.java. -jacoco = "0.8.15" +jacoco = "0.8.16" # We need to stay on the 1.3.x release line as 1.4.x requires Java 11 logback = "1.3.16" retrofit = "3.0.0"