[IGNORE - Automation test] Merge release/3.13.0 into develop - #3780
[IGNORE - Automation test] Merge release/3.13.0 into develop#3780abrooksv wants to merge 7 commits into
Conversation
Prepare the 3.13.0 release
abrooksv
changed the title
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 9da2e8a98a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| <<<<<<< HEAD | ||
| // This configures some well know cases for Android when memory leaks shouldn't be detected | ||
| LeakCanary.config = LeakCanary.config.copy( | ||
| referenceMatchers = AndroidReferenceMatchers.appDefaults | ||
| ||||||| a31a0aa82 |
There was a problem hiding this comment.
Resolve these raw conflict markers before merging. Whenever the instrumented:integration Android test sources are compiled, <<<<<<<, |||||||, and >>>>>>> are parsed as Kotlin and compilation fails, preventing the repository's prescribed integration suite from running. Keep the developed branch that adds the JobService matcher and remove all marker/alternate-branch lines.
AGENTS.md reference: AGENTS.md:L37-L45
Useful? React with 👍 / 👎.
| }.doWait(timeoutMs = FINAL_WAIT_MS) | ||
|
|
||
| LeakAssertions.assertNoLeaks() | ||
| } |
There was a problem hiding this comment.
Restore LeakAssertions.assertNoLeaks() after the event verification. When this startup instrumentation test runs, it now completes without checking for retained activities, undoing the parent branch's explicit fix that added the JobService reference matcher so this test could perform leak detection without the known CI false positive; real leaks introduced in this TTID path will therefore pass unnoticed.
Useful? React with 👍 / 👎.
4 participants
Automated merge-back PR created by CI after release 3.13.0.