Skip to content

chore: merge 0.16.x into master - #2114

Merged
jpnurmi merged 10 commits into
masterfrom
jpnurmi/chore/merge-0.16.x
Sep 19, 2026
Merged

jpnurmi merged 10 commits into
masterfrom
jpnurmi/chore/merge-0.16.x

Conversation

@jpnurmi

@jpnurmi jpnurmi commented Sep 19, 2026

Copy link
Copy Markdown
Collaborator

Since master already had some breaking 0.17 changes merged, 0.16.8 was released from a temporary 0.16.x hotfix branch:

This PR performs a manual merge of 0.16.x into master, resolving version conflicts and moving faulty 0.16.7 changelog entries back to the Unreleased section, and bringing in the note for 0.16.7.

jpnurmi and others added 10 commits September 18, 2026 10:39
* fix(ratelimiter): Respect envelope item categories

Honor feedback, log, metric, and attachment limits independently of
errors. Preserve attachment dependencies and minidump error limits, and
keep the longest backoff when limits overlap.

* Update CHANGELOG.md

* fix review finding
`master` already contains breaking changes for `0.17`, so the upcoming
`0.16.7` hotfix must ship from `0.16.x`. Selecting that branch only
changes the release source; Craft still defaults to merging the release
commit into `master` which will conflict.

Add the optional `merge_target` input following the _Release and
Versioning_ dev docs [1]. This lets hotfix releases merge their version
bump and changelog back into the hotfix branch, completing the release
process without conflicts with `master`. The default branch remains
the fallback when the input is omitted.

[1] https://develop.sentry.dev/sdk/getting-started/standards/release-versioning/#merge-target
* build(android): Upgrade AGP to replace flagged test tooling

FOSSA blocks releases on AGP `8.7.3`'s internal test dependencies:
`com.google.testing.platform` artifacts at `0.0.9-alpha02` use the
Android SDK license and aren't classified as test-only by FOSSA.
See [#2093](#2093).
AGP `9.4.0` uses `com.android.tools.utp:gradle-work-action:32.4.0`,
whose POM declares Apache 2.0.

Match `sentry-java`: Gradle `9.7.1`, Kotlin `2.3.21`, Maven Publish
`0.30.0`, Dokka `2.0.0`, Spotless `8.8.0`, Detekt `1.23.8`,
Develocity `4.5.0`, and API `37`. Add the `VERSION_AGP` override.

Gradle 9 removed `VersionNumber`, breaking the old publishing and
native-bundle plugins. Upgrade publishing, apply it before DSL
finalization, and copy legacy headers directly into the AAR.
Update Craft's source/Javadoc paths and regenerate the wrapper.

Keep Java `8`, NDK `27.0.12077973`, AAR `minCompileSdk=1`, and no
implicit library `targetSdk` to preserve hotfix compatibility.
Retain the legacy DSL, external Kotlin plugin, and pipeline signing.

API/unit checks, AAR compatibility comparison, release archive,
APK builds, and FOSSA dependency resolution pass locally. Hosted
FOSSA still needs CI verification. Lint flags only outdated
`annotations:23.0.0`, which matches `sentry-java`.

* Disable dependency update lint

Keep warnings-as-errors deterministic while retaining the annotations
version aligned with sentry-java.

* gradlew spotlessApply

* fix ndk 30 + asan

* respect ANDROID_NDK in Gradle configuration

* drop VERSION_AGP

* plugins & separators

* fix ANDROID_NDK (can be a path)
…2087)

* feat: allow tags before crash handler startup

* docs: clarify initial tags option

* Update CHANGELOG.md with new features and deprecations

* test: gate initial tags fast-fail on WER

* feat: generalize initial scope configuration
The root compileJava task has no sources. Successful Java scans only
captured Gradle's generated project accessors, leaving the SDK's Java
sources unanalyzed.

Upgrading Gradle from 8.9 to 9.7.1 moved those accessors into Gradle
User Home, which setup-gradle restores from cache. Once cached, no
Java compilation remained for CodeQL to observe, so analysis failed
with exit code 32.

Run compileReleaseJavaWithJavac to compile the library and sample.
Disable the build cache and force task execution so CodeQL observes
compilation even when Gradle state is restored.

Validated release Java compilation for both modules with Java 17.
Comment thread CHANGELOG.md
@codecov

codecov Bot commented Sep 19, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.85%. Comparing base (eb850cd) to head (c0149d0).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2114      +/-   ##
==========================================
- Coverage   74.88%   74.85%   -0.03%     
==========================================
  Files         103      103              
  Lines       27449    27449              
  Branches     4966     4966              
==========================================
- Hits        20554    20548       -6     
  Misses       5550     5550              
- Partials     1345     1351       +6     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jpnurmi
jpnurmi merged commit 8183ab7 into master Sep 19, 2026
65 checks passed
@jpnurmi
jpnurmi deleted the jpnurmi/chore/merge-0.16.x branch September 19, 2026 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants