Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
### Dependencies

- The SDK is now compiled with Android Gradle Plugin 9.2.1 ([#5779](https://github.com/getsentry/sentry-java/pull/5779))
- The SDK has been fully tested for compatibility with Android 17 and platform 37; it is now compiled and tested against it ([#5796](https://github.com/getsentry/sentry-java/pull/5796))

## 8.49.0

Expand Down
14 changes: 0 additions & 14 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -113,20 +113,6 @@ allprojects {
subprojects {
apply { plugin("io.sentry.spotless") }

// AGP 9.2 bundles lint 9.2.1, which flags compileSdk 36 as outdated because 37 is available.
// We intentionally stay on compileSdk 36 until the API 37 bump (#5768), so silence that check
// for every Android module (library and application).
pluginManager.withPlugin("com.android.library") {
extensions.configure<com.android.build.gradle.BaseExtension> {
lintOptions { disable("GradleDependency") }
}
}
pluginManager.withPlugin("com.android.application") {
extensions.configure<com.android.build.gradle.BaseExtension> {
lintOptions { disable("GradleDependency") }
}
}

plugins.withId(Config.QualityPlugins.detektPlugin) {
configure<DetektExtension> {
buildUponDefaultConfig = true
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ springboot4 = "4.1.0"
sqldelight = "2.3.2"

# Android
targetSdk = "36"
compileSdk = "36"
targetSdk = "37"
compileSdk = "37"
minSdk = "21"

[plugins]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ android {
lint {
warningsAsErrors = true
checkDependencies = true
// Suppress OldTargetApi: lint 9.2.1 expects API 37 but we target 36
disable += "OldTargetApi"

// We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
checkReleaseBuilds = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ android {
lint {
warningsAsErrors = true
checkDependencies = true
// Suppress OldTargetApi: lint 9.2.1 expects API 37 but we target 36
disable += "OldTargetApi"

// We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
checkReleaseBuilds = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ internal class SimpleVideoEncoder(
val videoCapabilities =
mediaCodec.codecInfo.getCapabilitiesForType(muxerConfig.mimeType).videoCapabilities

if (!videoCapabilities.bitrateRange.contains(bitRate)) {
if (videoCapabilities != null && !videoCapabilities.bitrateRange.contains(bitRate)) {
options.logger.log(
DEBUG,
"Encoder doesn't support the provided bitRate: $bitRate, the value will be clamped to the closest one",
Expand Down
Loading