Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Bump conscrypt-android from 2.4.0 to 2.5.0 (#118)
Bumps [conscrypt-android](https://github.com/google/conscrypt) from 2.4.0 to 2.5.0. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/google/conscrypt/commit/1283c13e540898a11ce32b5dc924053d141f727a"><code>1283c13</code></a> Use SSLEngine-based SSLSocket by default.</li> <li><a href="https://github.com/google/conscrypt/commit/31f4f0ebcfeebcd7baaa1579b7bdf845ec6a1cd9"><code>31f4f0e</code></a> Preparing version 2.5.0</li> <li><a href="https://github.com/google/conscrypt/commit/8ccdfe520ba405d2f98543ad42224c169a6cc1e6"><code>8ccdfe5</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/google/conscrypt/issues/867">#867</a> from d-reidenbach/trust</li> <li><a href="https://github.com/google/conscrypt/commit/c209bc90f0d13e00b526b45cdc065b667cb3e6c6"><code>c209bc9</code></a> Merge branch 'master' into trust</li> <li><a href="https://github.com/google/conscrypt/commit/785ead00a556fa45a7c81e8d2bc291e36be7c94f"><code>785ead0</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/google/conscrypt/issues/871">#871</a> from prbprbprb/bytebuf_switch</li> <li><a href="https://github.com/google/conscrypt/commit/f85158ce074f894d25cfeb3e0325ecf5de5cb384"><code>f85158c</code></a> Add a boolean to OpenSSLAeadCipher to control optimisations.</li> <li><a href="https://github.com/google/conscrypt/commit/f8e67a81a5137033a0a588f4262a4bb6a1a5524f"><code>f8e67a8</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/google/conscrypt/issues/870">#870</a> from prbprbprb/lint_fixes</li> <li><a href="https://github.com/google/conscrypt/commit/b45dbe8d558323df995dfc3780f442b2d5ce5ea1"><code>b45dbe8</code></a> Flaky Integration Commit</li> <li><a href="https://github.com/google/conscrypt/commit/b255ddb4ded1682cd49089e665e75a143bea0052"><code>b255ddb</code></a> Minor changes for error-prone lints errors.</li> <li><a href="https://github.com/google/conscrypt/commit/840aa5e2f64239427fd7e5d2e75d7541b73e08e8"><code>840aa5e</code></a> Remove commented out code and simplify slightly</li> <li>Additional commits viewable in <a href="https://github.com/google/conscrypt/compare/2.4.0...2.5.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=org.conscrypt:conscrypt-android&package-manager=gradle&previous-version=2.4.0&new-version=2.5.0)](https://dependabot.com/compatibility-score/?dependency-name=org.conscrypt:conscrypt-android&package-manager=gradle&previous-version=2.4.0&new-version=2.5.0) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
- Loading branch information