Skip to content

Merge release 3.11.0 into develop - #3547

Merged
aleksandr-gringauz merged 3 commits into
developfrom
aleksandr-gringauz/merge-release-3.11.0-to-develop
Jun 17, 2026
Merged

Merge release 3.11.0 into develop#3547
aleksandr-gringauz merged 3 commits into
developfrom
aleksandr-gringauz/merge-release-3.11.0-to-develop

Conversation

@aleksandr-gringauz

Copy link
Copy Markdown
Contributor

What does this PR do?

Merges the release/3.11.0 branch back into develop as part of the 3.11.0 release process.

The merge conflict on AndroidConfig.VERSION was resolved by keeping the develop version 3.12.0-SNAPSHOT.

Review checklist

  • Version remains 3.12.0-SNAPSHOT
  • 3.11.0 CHANGELOG entry present

Made with Cursor

aleksandr-gringauz and others added 3 commits June 16, 2026 14:47
Update the CHANGELOG and switch AndroidConfig version from SNAPSHOT to Release.

Co-authored-by: Cursor <cursoragent@cursor.com>
…/merge-release-3.11.0-to-develop

Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
@datadog-datadog-prod-us1-2

This comment has been minimized.

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.42%. Comparing base (e07c4cc) to head (5fd4646).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3547      +/-   ##
===========================================
- Coverage    72.45%   72.42%   -0.03%     
===========================================
  Files          967      967              
  Lines        35711    35711              
  Branches      5973     5973              
===========================================
- Hits         25872    25862      -10     
- Misses        8178     8191      +13     
+ Partials      1661     1658       -3     

see 38 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@aleksandr-gringauz

Copy link
Copy Markdown
Contributor Author

Apparently the Gitlab workflow to upload the changelog is broken since release 3.6.0 (for example #3395).

Most likely some api token expired. Not blocking for now.

@aleksandr-gringauz
aleksandr-gringauz marked this pull request as ready for review June 17, 2026 11:52
@aleksandr-gringauz
aleksandr-gringauz requested review from a team as code owners June 17, 2026 11:52
@aleksandr-gringauz
aleksandr-gringauz merged commit 221f45b into develop Jun 17, 2026
27 of 28 checks passed
@aleksandr-gringauz
aleksandr-gringauz deleted the aleksandr-gringauz/merge-release-3.11.0-to-develop branch June 17, 2026 12:50
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.

4 participants