diff --git a/CHANGELOG.md b/CHANGELOG.md index be7899e2dd..1f6294428e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,6 +112,7 @@ - OpenTelemetry Semantic Conventions to 1.44.0 (was 1.42.0) - OpenTelemetry Semantic Conventions Alpha to 1.44.0-alpha (was 1.42.0-alpha) - OpenTelemetry 1.67 creates no-op spans when no `SpanProcessor` is configured. If you construct the OpenTelemetry SDK manually while using `sentry-opentelemetry-otlp` classes directly, configure a span processor. Without one, Sentry cannot inspect outgoing request URLs and may inject `sentry-trace` and `baggage` headers into destinations excluded by `tracePropagationTargets`. Standard OTLP exporter, Sentry Java agent, and agentless setups already configure one. +- Bump `androidx.lifecycle:lifecycle-runtime-compose`, which `sentry-android-navigation3` brings in transitively, from 2.8.3 to 2.10.0. Navigation 3 1.0.0 already requires 2.10.0, so apps that use it resolve the same version as before ([#6664](https://github.com/getsentry/sentry-java/pull/6664)) ### Internal diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7b3a04b0ea..5cdd8b54d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -117,7 +117,7 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.19.1" } androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.3.5" } androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidxLifecycle" } androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "2.8.3" } +androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version = "2.10.0" } androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidxNavigation" } diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts index 557a5fab63..f954486de9 100644 --- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts +++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts @@ -77,10 +77,6 @@ android { // This module is the one lint picks to check the build root's Gradle wrapper, and this check // compares it with the latest Gradle release online, so every new release would fail the build. disable += "AndroidGradlePluginVersion" - - // Lint 9.5 can't load the custom checks bundled with older androidx.lifecycle releases and - // reports that it skips them. They only cover lifecycle APIs this module doesn't call. - disable += "ObsoleteLintCustomCheck" } androidComponents.beforeVariants { @@ -133,6 +129,12 @@ dependencies { androidTestImplementation(libs.kotlin.test.junit) androidTestImplementation(libs.leakcanary.instrumentation) androidTestImplementation(libs.okhttp.mockwebserver4) + + constraints { + // Lint 9.5 can't load the custom lint checks of lifecycle releases before 2.10.0. Lifecycle + // aligns all its artifacts to one version, so raising this one raises them all. + implementation(libs.androidx.lifecycle.runtime.compose) + } } // net.ltgt.errorprone only configures Gradle's JVM source sets, not Android variants, so put Error diff --git a/sentry-android-navigation3/build.gradle.kts b/sentry-android-navigation3/build.gradle.kts index 9478825b34..13c5cf95ec 100644 --- a/sentry-android-navigation3/build.gradle.kts +++ b/sentry-android-navigation3/build.gradle.kts @@ -52,10 +52,6 @@ android { warningsAsErrors = true checkDependencies = true - // Lifecycle 2.8.3's lint checks are incompatible with AGP 9.5. Lifecycle 2.10.0 fixes them, - // but raises minSdk to 23 while this SDK still supports 21. - disable += "ObsoleteLintCustomCheck" - // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks. checkReleaseBuilds = false }