Skip to content

Commit ce4b2c1

Browse files
github-actions[bot]web-flowromtsngetsentry-botadinauer
authored
chore(deps): update Gradle to v9.4.1 (#5063)
* chore: update scripts/update-gradle.sh to v9.4.1 * Fix build * fix dependsOn * align shadow plugin version * Fix apollo version * Format code * fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibility (#5263) * fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibility The Spring Boot 2.7.x Gradle plugin uses removed Gradle APIs (LenientConfiguration.getFiles()) that are incompatible with Gradle 9. Library modules (sentry-spring, sentry-spring-boot, sentry-spring-boot-starter): - Replace SpringBootPlugin.BOM_COORDINATES with direct BOM reference via version catalog (libs.springboot2.bom) - Remove the 'apply false' plugin declaration entirely Sample apps (spring-boot, webflux, otel, netflix-dgs): - Replace Spring Boot plugin with Shadow plugin for fat JAR creation - Add application plugin for main class configuration - Use platform(libs.springboot2.bom) for dependency version management - Configure shadow JAR to merge Spring metadata files - Replace BootRun task with JavaExec in otel sample * fix: set duplicatesStrategy=INCLUDE for shadow JAR spring.factories merge Shadow plugin 9.x defaults to DuplicatesStrategy.EXCLUDE, which drops duplicate META-INF/spring.factories entries before transformers can merge them. Setting INCLUDE allows the AppendingTransformer to see all entries and properly concatenate spring.factories from all JARs. Without this, the shadow JAR only contains spring.factories from a single dependency, causing Spring Boot auto-configuration to fail (e.g. missing RestTemplateBuilder, no embedded web server). * fix: remove duplicate shadow plugin entry in version catalog * Format code * fix: update system test runner for shadow JAR compatibility - Auto-detect shadowJar vs bootJar build task based on build.gradle.kts - Add fallback HTTP readiness check for shadow JAR apps that lack actuator endpoints (actuator web endpoints don't work in flat JARs) - Append spring-autoconfigure-metadata.properties in shadow JAR config * fix(otel): use DuplicatesStrategy.INCLUDE for otel agent shadow JAR Shadow 9.x enforces duplicatesStrategy before transformers run, so DuplicatesStrategy.FAIL prevents mergeServiceFiles from merging inst/META-INF/services/ files that exist in both the upstream OTel agent JAR and the isolated distro libs. Switching to INCLUDE lets the transformer see all duplicates and merge them correctly. * Exclude test-support modules from api validation * Verbose system test output and wire inputs for them properly * align coroutines version to 1.9.0 for system tests * fix(otel): use mergeServiceFiles path instead of include for Shadow 9.x Shadow 9.x's ServiceFileTransformer strips the `inst/` prefix when using `include("inst/META-INF/services/*")`, placing merged service files under `META-INF/services/` instead of `inst/META-INF/services/`. This breaks the OTel agent's classloader which expects isolated services under `inst/`. Using `path = "inst/META-INF/services"` preserves the correct output path. Also add missing `duplicatesStrategy = DuplicatesStrategy.INCLUDE` to console-otlp, log4j2, and console-opentelemetry-noagent shadow JARs so that mergeServiceFiles and Log4j2 transformers can see duplicates before they are deduplicated. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(otel): add default mergeServiceFiles for bootstrap service relocation Shadow 9.x only applies package relocations to service files that are claimed by a ServiceFileTransformer. The ContextStorageProvider service file at META-INF/services/ was not being relocated because it wasn't handled by any transformer — only the inst/META-INF/services/ files were. Adding a default mergeServiceFiles() call ensures bootstrap service files (like ContextStorageProvider) go through the transformer and get properly relocated to their shaded paths. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(spring-boot2): pre-merge Spring metadata for Shadow 9.x compatibility Shadow 9.x enforces DuplicatesStrategy before transformers run, which breaks the `append` transformer for spring.factories and other Spring metadata files. Only the last copy survives instead of being concatenated. Replace `append` calls with a pre-merge task that manually concatenates Spring metadata files (spring.factories, spring.handlers, spring.schemas, spring-autoconfigure-metadata.properties) from the runtime classpath before the shadow JAR is built. The merged files are included first in the shadow JAR so they take precedence over duplicates from dependency JARs. This fixes the PersonSystemTest failure where @SentrySpan AOP and JDBC instrumentation weren't working because SentryAutoConfiguration wasn't properly registered in the merged spring.factories. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Format code * fix(lint): suppress OldTargetApi for uitest-android module Lint 8.13.1 (set via android.experimental.lint.version) expects targetSdk 37 but we target 36. This is a test-only module so suppressing is safe. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(spring-boot2): make mergeSpringMetadata configuration-cache compatible Resolve the runtime classpath at configuration time (not inside doLast) so the task doesn't capture Gradle script object references that can't be serialized by the configuration cache. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(spring-boot2): replace from() with doLast JAR patching for spring metadata The from() approach with DuplicatesStrategy.INCLUDE doesn't work because dependency JARs' spring.factories overwrites the pre-merged version. Instead, let the shadow JAR build normally, then use a doLast action to replace the Spring metadata files in the built JAR with the properly merged versions using the NIO ZIP filesystem API. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(spring-boot2): merge AutoConfiguration.imports + doLast JAR patching The shadow JAR was missing the embedded web server auto-configuration because AutoConfiguration.imports (used by SB 2.7+) had duplicate entries from multiple dependency JARs, with only the last copy surviving. Add AutoConfiguration.imports to the pre-merge file list and use doLast JAR patching via NIO ZIP filesystem to replace metadata files after the shadow JAR is built, avoiding the DuplicatesStrategy issue entirely. Also suppress OldTargetApi lint for uitest-android-benchmark module. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(spring-boot2): also merge ManagementContextConfiguration.imports This file has duplicate entries across actuator JARs and needs the same pre-merge treatment as AutoConfiguration.imports. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(spring-boot2): use separate patchSpringMetadata task for JAR patching The doLast on shadowJar doesn't run when the task is cached/up-to-date. Move JAR patching to a separate `patchSpringMetadata` task that is finalized by shadowJar, ensuring it always runs. Also use recursive walkTopDown to handle nested directories (e.g. META-INF/spring/). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(spring-boot2): revert to doLast on shadowJar for Spring metadata patching The separate patchSpringMetadata task approach caused regressions — the finalizedBy relationship didn't reliably execute the patching in CI. Revert to doLast directly on shadowJar with outputs.upToDateWhen { false } to ensure the patching always runs. Also use walkTopDown for recursive directory traversal (needed for META-INF/spring/ subdirectory). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(spring-boot2): inline Spring metadata merge into shadowJar doLast Replace the separate mergeSpringMetadata task with inline doLast on shadowJar that resolves runtimeClasspath at execution time (not configuration time). This ensures all project dependency JARs are built before their spring.factories entries are read and merged. Verified locally: 20/21 system tests pass. Only PersonSystemTest 'create person works' fails due to @SentrySpan AOP limitation in shadow JARs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * formatting * fix(build): make Spring sample shadowJar patching config-cache safe * fix(build): merge Spring metadata properties in shadow jars * fix(build): preserve escaped spring metadata keys * refactor(samples): drop no-op spring shadow service merging * test(android): Avoid ANR profiling integration test race Drive the ANR profiling state-machine test synchronously instead of starting the background polling thread. The previous version could read the queue-backed profile store while the polling thread was still appending stack traces, which made the release unit test flaky with NoSuchElementException in QueueFile iteration. Co-Authored-By: Codex <noreply@openai.com> * fix(test): Require actuator health for Spring readiness * ref(build): Share Spring metadata file list Move the Spring metadata entry list into MergeSpringMetadataAction so the Spring sample shadowJar tasks use one source of truth. Drop the temporary system-test-runner unit test and keep verification on the existing Spring Boot system test flow. Co-Authored-By: Codex <noreply@openai.com> * docs(build): Document Spring metadata merge action Explain that MergeSpringMetadataAction patches shadow JARs by merging Spring metadata with file-specific semantics and by preserving service-provider registrations from the runtime classpath. This keeps the intent of the build logic clear without changing behavior. Co-Authored-By: Codex <noreply@openai.com> * build(opentelemetry): Fail agent shadow duplicates by default Set the final agent shadowJar to fail on unexpected duplicate entries while still allowing service descriptors to merge in the bootstrap and inst paths. This keeps duplicate handling strict without breaking the service file transformers Shadow still relies on. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: Roman Zavarnitsyn <rom4ek93@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Codex <noreply@openai.com> * Apply suggestion from @romtsn --------- Co-authored-by: GitHub <noreply@github.com> Co-authored-by: Roman Zavarnitsyn <rom4ek93@gmail.com> Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: Alexander Dinauer <adinauer@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Codex <noreply@openai.com>
1 parent 0675272 commit ce4b2c1

File tree

43 files changed

+620
-755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+620
-755
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22

33
## Unreleased
44

5+
### Internal
6+
7+
- Bump AGP version from v8.6.0 to v8.13.1 ([#5063](https://github.com/getsentry/sentry-java/pull/5063))
8+
59
### Dependencies
610

711
- Bump Native SDK from v0.13.3 to v0.13.6 ([#5277](https://github.com/getsentry/sentry-java/pull/5277))
812
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0136)
913
- [diff](https://github.com/getsentry/sentry-native/compare/0.13.3...0.13.6)
14+
- Bump Gradle from v8.14.3 to v9.4.1 ([#5063](https://github.com/getsentry/sentry-java/pull/5063))
15+
- [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v941)
16+
- [diff](https://github.com/gradle/gradle/compare/v8.14.3...v9.4.1)
1017

1118
## 8.38.0
1219

build.gradle.kts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ apiValidation {
8787
"test-app-sentry",
8888
"test-app-size",
8989
"sentry-samples-netflix-dgs",
90-
"sentry-samples-console-otlp"
90+
"sentry-samples-console-otlp",
91+
"sentry-test-support",
92+
"sentry-system-test-support"
9193
)
9294
)
9395
}
@@ -249,9 +251,13 @@ tasks.register("buildForCodeQL") {
249251
}
250252
.forEach { proj ->
251253
if (proj.plugins.hasPlugin("com.android.library")) {
252-
this.dependsOn(proj.tasks.findByName("compileReleaseUnitTestSources"))
254+
proj.tasks.findByName("compileReleaseUnitTestSources")?.let { testTask ->
255+
this.dependsOn(testTask)
256+
}
253257
} else {
254-
this.dependsOn(proj.tasks.findByName("testClasses"))
258+
proj.tasks.findByName("testClasses")?.let { testTask ->
259+
this.dependsOn(testTask)
260+
}
255261
}
256262
}
257263
}

buildSrc/src/main/java/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import java.math.BigDecimal
33

44
object Config {
5-
val AGP = System.getenv("VERSION_AGP") ?: "8.6.0"
5+
val AGP = System.getenv("VERSION_AGP") ?: "8.13.1"
66
val kotlinStdLib = "stdlib-jdk8"
77
val kotlinStdLibVersionAndroid = "1.9.24"
88
val kotlinTestJunit = "test-junit"
Lines changed: 292 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,292 @@
1+
import java.net.URI
2+
import java.nio.file.FileSystems
3+
import java.nio.file.Files
4+
import java.util.LinkedHashSet
5+
import java.util.zip.ZipFile
6+
import org.gradle.api.Action
7+
import org.gradle.api.Task
8+
import org.gradle.api.file.FileCollection
9+
import org.gradle.api.tasks.bundling.AbstractArchiveTask
10+
11+
/**
12+
* Patches a built shadow JAR by merging Spring metadata and service descriptor files from the
13+
* runtime classpath into the final archive.
14+
*
15+
* Spring metadata files do not all share the same merge semantics, so this action merges
16+
* `spring.factories` as list properties, `.imports` files as line-based metadata, and other Spring
17+
* metadata as key/value properties. It also deduplicates service-provider configuration entries
18+
* under `META-INF/services` so the flat executable JAR keeps the runtime registrations it needs.
19+
*/
20+
class MergeSpringMetadataAction(
21+
private val runtimeClasspath: FileCollection,
22+
private val springMetadataFiles: List<String>,
23+
) : Action<Task> {
24+
companion object {
25+
val DEFAULT_SPRING_METADATA_FILES =
26+
listOf(
27+
"META-INF/spring.factories",
28+
"META-INF/spring.handlers",
29+
"META-INF/spring.schemas",
30+
"META-INF/spring-autoconfigure-metadata.properties",
31+
"META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports",
32+
"META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports",
33+
)
34+
}
35+
36+
override fun execute(task: Task) {
37+
val archiveTask = task as AbstractArchiveTask
38+
val jar = archiveTask.archiveFile.get().asFile
39+
val runtimeJars = runtimeClasspath.files.filter { it.name.endsWith(".jar") }
40+
val uri = URI.create("jar:${jar.toURI()}")
41+
42+
FileSystems.newFileSystem(uri, mapOf("create" to "false")).use { fs ->
43+
springMetadataFiles.forEach { entryPath ->
44+
val target = fs.getPath(entryPath)
45+
val contents = mutableListOf<String>()
46+
47+
if (Files.exists(target)) {
48+
contents.add(Files.readString(target))
49+
}
50+
51+
runtimeJars.forEach { depJar ->
52+
try {
53+
ZipFile(depJar).use { zip ->
54+
val entry = zip.getEntry(entryPath)
55+
if (entry != null) {
56+
contents.add(zip.getInputStream(entry).bufferedReader().readText())
57+
}
58+
}
59+
} catch (_: Exception) {
60+
// Ignore non-zip files on the runtime classpath.
61+
}
62+
}
63+
64+
val merged =
65+
when {
66+
entryPath == "META-INF/spring.factories" -> mergeListProperties(contents)
67+
entryPath.endsWith(".imports") -> mergeLineBasedMetadata(contents)
68+
else -> mergeMapProperties(contents)
69+
}
70+
71+
if (merged.isNotEmpty()) {
72+
if (target.parent != null) {
73+
Files.createDirectories(target.parent)
74+
}
75+
Files.write(target, merged.toByteArray())
76+
}
77+
}
78+
79+
val serviceEntries = linkedSetOf<String>()
80+
81+
runtimeJars.forEach { depJar ->
82+
try {
83+
ZipFile(depJar).use { zip ->
84+
val entries = zip.entries()
85+
while (entries.hasMoreElements()) {
86+
val entry = entries.nextElement()
87+
if (!entry.isDirectory && entry.name.startsWith("META-INF/services/")) {
88+
serviceEntries.add(entry.name)
89+
}
90+
}
91+
}
92+
} catch (_: Exception) {
93+
// Ignore non-zip files on the runtime classpath.
94+
}
95+
}
96+
97+
serviceEntries.forEach { entryPath ->
98+
val providers = LinkedHashSet<String>()
99+
val target = fs.getPath(entryPath)
100+
101+
if (Files.exists(target)) {
102+
Files.newBufferedReader(target).useLines { lines ->
103+
lines.forEach { line ->
104+
val provider = line.trim()
105+
if (provider.isNotEmpty() && !provider.startsWith("#")) {
106+
providers.add(provider)
107+
}
108+
}
109+
}
110+
}
111+
112+
runtimeJars.forEach { depJar ->
113+
try {
114+
ZipFile(depJar).use { zip ->
115+
val entry = zip.getEntry(entryPath)
116+
if (entry != null) {
117+
zip.getInputStream(entry).bufferedReader().useLines { lines ->
118+
lines.forEach { line ->
119+
val provider = line.trim()
120+
if (provider.isNotEmpty() && !provider.startsWith("#")) {
121+
providers.add(provider)
122+
}
123+
}
124+
}
125+
}
126+
}
127+
} catch (_: Exception) {
128+
// Ignore non-zip files on the runtime classpath.
129+
}
130+
}
131+
132+
if (providers.isNotEmpty()) {
133+
if (target.parent != null) {
134+
Files.createDirectories(target.parent)
135+
}
136+
Files.write(target, providers.joinToString(separator = "\n", postfix = "\n").toByteArray())
137+
}
138+
}
139+
}
140+
}
141+
142+
private fun mergeLineBasedMetadata(contents: List<String>): String {
143+
val lines = LinkedHashSet<String>()
144+
145+
contents.forEach { content ->
146+
content.lineSequence().forEach { rawLine ->
147+
val line = rawLine.trim()
148+
if (line.isNotEmpty() && !line.startsWith("#")) {
149+
lines.add(line)
150+
}
151+
}
152+
}
153+
154+
return if (lines.isEmpty()) "" else lines.joinToString(separator = "\n", postfix = "\n")
155+
}
156+
157+
private fun mergeMapProperties(contents: List<String>): String {
158+
val merged = linkedMapOf<String, String>()
159+
160+
contents.forEach { content ->
161+
parseProperties(content).forEach { (key, value) ->
162+
merged[key] = value
163+
}
164+
}
165+
166+
return if (merged.isEmpty()) {
167+
""
168+
} else {
169+
merged.entries.joinToString(separator = "\n", postfix = "\n") { (key, value) -> "$key=$value" }
170+
}
171+
}
172+
173+
private fun mergeListProperties(contents: List<String>): String {
174+
val merged = linkedMapOf<String, LinkedHashSet<String>>()
175+
176+
contents.forEach { content ->
177+
parseProperties(content).forEach { (key, value) ->
178+
val values = merged.getOrPut(key) { LinkedHashSet() }
179+
value
180+
.split(',')
181+
.map(String::trim)
182+
.filter(String::isNotEmpty)
183+
.forEach(values::add)
184+
}
185+
}
186+
187+
return if (merged.isEmpty()) {
188+
""
189+
} else {
190+
merged.entries.joinToString(separator = "\n", postfix = "\n") { (key, values) ->
191+
"$key=${values.joinToString(separator = ",")}"
192+
}
193+
}
194+
}
195+
196+
private fun parseProperties(content: String): List<Pair<String, String>> {
197+
val logicalLines = mutableListOf<String>()
198+
val current = StringBuilder()
199+
200+
content.lineSequence().forEach { rawLine ->
201+
val line = rawLine.trim()
202+
if (current.isEmpty() && (line.isEmpty() || line.startsWith("#") || line.startsWith("!"))) {
203+
return@forEach
204+
}
205+
206+
val normalized = if (current.isEmpty()) line else line.trimStart()
207+
current.append(
208+
if (endsWithContinuation(rawLine)) normalized.dropLast(1) else normalized,
209+
)
210+
211+
if (!endsWithContinuation(rawLine)) {
212+
logicalLines.add(current.toString())
213+
current.setLength(0)
214+
}
215+
}
216+
217+
if (current.isNotEmpty()) {
218+
logicalLines.add(current.toString())
219+
}
220+
221+
return logicalLines.map { line ->
222+
val separatorIndex = findSeparatorIndex(line)
223+
if (separatorIndex < 0) {
224+
line to ""
225+
} else {
226+
val keyEnd = trimTrailingWhitespace(line, separatorIndex)
227+
val valueStart = findValueStart(line, separatorIndex)
228+
line.substring(0, keyEnd) to line.substring(valueStart).trim()
229+
}
230+
}
231+
}
232+
233+
private fun endsWithContinuation(line: String): Boolean {
234+
var backslashCount = 0
235+
236+
for (index in line.length - 1 downTo 0) {
237+
if (line[index] == '\\') {
238+
backslashCount++
239+
} else {
240+
break
241+
}
242+
}
243+
244+
return backslashCount % 2 == 1
245+
}
246+
247+
private fun findSeparatorIndex(line: String): Int {
248+
var backslashCount = 0
249+
250+
line.forEachIndexed { index, char ->
251+
if (char == '\\') {
252+
backslashCount++
253+
} else {
254+
val isEscaped = backslashCount % 2 == 1
255+
if (!isEscaped && (char == '=' || char == ':' || char.isWhitespace())) {
256+
return index
257+
}
258+
backslashCount = 0
259+
}
260+
}
261+
262+
return -1
263+
}
264+
265+
private fun trimTrailingWhitespace(line: String, endExclusive: Int): Int {
266+
var end = endExclusive
267+
268+
while (end > 0 && line[end - 1].isWhitespace()) {
269+
end--
270+
}
271+
272+
return end
273+
}
274+
275+
private fun findValueStart(line: String, separatorIndex: Int): Int {
276+
var valueStart = separatorIndex
277+
278+
while (valueStart < line.length && line[valueStart].isWhitespace()) {
279+
valueStart++
280+
}
281+
282+
if (valueStart < line.length && (line[valueStart] == '=' || line[valueStart] == ':')) {
283+
valueStart++
284+
}
285+
286+
while (valueStart < line.length && line[valueStart].isWhitespace()) {
287+
valueStart++
288+
}
289+
290+
return valueStart
291+
}
292+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
99

1010
# AndroidX required by AGP >= 3.6.x
1111
android.useAndroidX=true
12-
android.experimental.lint.version=8.9.0
12+
android.experimental.lint.version=8.13.1
1313

1414
# Release information
1515
versionName=8.38.0

gradle/libs.versions.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
6161
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
6262
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
6363
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
64-
springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
6564
springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
6665
springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" }
67-
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
66+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
6867
gretty = { id = "org.gretty", version = "4.0.0" }
6968
animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" }
7069
sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"}
70+
shadow = { id = "com.gradleup.shadow", version = "9.4.1" }
7171

7272
[libraries]
7373
apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
@@ -158,6 +158,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
158158
slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
159159
slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
160160
spotlessLib = { module = "com.diffplug.spotless:com.diffplug.spotless.gradle.plugin", version.ref = "spotless"}
161+
springboot2-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springboot2" }
161162
springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
162163
springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
163164
springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

sentry-android-core/src/test/java/io/sentry/android/core/anr/AnrProfilingIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class AnrProfilingIntegrationTest {
174174

175175
val integration = AnrProfilingIntegration()
176176
integration.register(mockScopes, androidOptions)
177-
integration.onForeground()
177+
// Drive the state machine synchronously to avoid racing the background polling thread.
178178

179179
SystemClock.setCurrentTimeMillis(1_000)
180180
integration.checkMainThread(mainThread)

0 commit comments

Comments
 (0)