[pull] master from yujincheng08:master #186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Bumps `protobuf` from 3.24.4 to 3.25.0. Updates `com.google.protobuf:protobuf-kotlin-lite` from 3.24.4 to 3.25.0 Updates `com.google.protobuf:protobuf-javalite` from 3.24.4 to 3.25.0 Updates `com.google.protobuf:protoc` from 3.24.4 to 3.25.0 <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/protocolbuffers/protobuf/commit/6b5d8db01fe47478e8d400f550e797e6230d464e"><code>6b5d8db</code></a> Updating version.json and repo version numbers to: 25.0</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/59a66af1465c8abbc78c7506153ae7f711b991f2"><code>59a66af</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14583">#14583</a> from haberman/cherry-pick-python-memory-leak</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/1711ebd4559313555e89d0f56294842779c7e900"><code>1711ebd</code></a> Fixed Python memory leak in map lookup.</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/8defef58f4367d3a968b44000698e308a035ab9e"><code>8defef5</code></a> Include .inc files directly instead of through a filegroup (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14575">#14575</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/0a5d6d4a45880a3076681cbd7d88e0985b4ccdb7"><code>0a5d6d4</code></a> Check that ffi-compiler loads before using it to define tasks. (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14538">#14538</a>) (<a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14560">#14560</a>)</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/a4964a44f7ae6d00584658422d19d337959ee79d"><code>a4964a4</code></a> Merge pull request <a href="https://redirect.github.com/protocolbuffers/protobuf/issues/14460">#14460</a> from protocolbuffers/25.x-202310181825</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/08b6c404af3cba3e054bec05221faa296584dba9"><code>08b6c40</code></a> Updating version.json to: 25.0-dev</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/ba1aab2baf19e83cc8c5532f98e5f90bd6d21fd5"><code>ba1aab2</code></a> Updating version.json and repo version numbers to: 25.0-rc2</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/3f05c099c3ad62b4af33cf4e78bc4674c32cc680"><code>3f05c09</code></a> update test runners</li> <li><a href="https://github.com/protocolbuffers/protobuf/commit/b4abcef8a954383d860a9367465fb398e5992d82"><code>b4abcef</code></a> Bump minimum PHP to 8.0</li> <li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.24.4...v3.25.0">compare view</a></li> </ul> </details> <br /> 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 show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@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) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )