Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.23.3
Choose a base ref
...
head repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.23.4
Choose a head ref
  • 13 commits
  • 54 files changed
  • 8 contributors

Commits on Jun 14, 2023

  1. Updating version.json to: 23.4-dev

    @protobuf-team-bot
    protobuf-team-bot committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    107c36e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13058 from protocolbuffers/23.x-202306140951 

    23.x 202306140951
    @mkruskal-google
    mkruskal-google authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    689f9c1 View commit details
    Browse the repository at this point in the history

  3. Clean up staleness tests. (#13049) 

    Our automation can't currently update release branches, so we need to enable staleness tests as presubmits to force manual regeneration.

PiperOrigin-RevId: 540094169
    @mkruskal-google
    mkruskal-google authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    0daa1b1 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Modify port_def.inc to ignore -Wshadow warning (#13059) 

    Closes #13037

Closes #13059

COPYBARA_INTEGRATE_REVIEW=#13059 from 4kangjc:main 71b2fc5
PiperOrigin-RevId: 540886449
    @4kangjc @fowles
    4kangjc authored and fowles committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    6241d42 View commit details
    Browse the repository at this point in the history

  2. Fix a typo 

    PiperOrigin-RevId: 540349262
    @fowles
    fowles committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1291253 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13088 from fowles/23.x 

    Modify port_def.inc to ignore -Wshadow warning (#13059)
    @fowles
    fowles authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    528e673 View commit details
    Browse the repository at this point in the history

  4. Add dllexport_decl for generated default instance. (#13085) 

    Fixes #13084

Closes #13085

COPYBARA_INTEGRATE_REVIEW=#13085 from owent:add_dllexport_decl_for_generated_default_instance a46d4e8
PiperOrigin-RevId: 540938351
    @owent @fowles
    owent authored and fowles committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    0c70d95 View commit details
    Browse the repository at this point in the history

  5. update stale files

    @fowles
    fowles committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    3312fc2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13090 from fowles/23.x 

    Add dllexport_decl for generated default instance. (#13085)
    @fowles
    fowles authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    62d7b37 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. deps: Update Guava to 32.0.1 

    Follow-up from #12953 to update to `32.0.1` to fix an issue on windows:

https://github.com/google/guava/releases/tag/v32.0.1

The underlying issue likely does not affect protobuf as it does not appear to (directly) use the affected `Files.createTempDir` or `FileBackedOutputStream` code which was apparently broken on Windows in `32.0.0`.

Seems best to update anyway.

(cherry picked from commit c95ebb7)
    @chadlwilson
    chadlwilson committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    40d5777 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13106 from chadlwilson/backport-bump-guava-3201 

    [23.x] Backport deps: Update Guava 32.0.1
    @zhangskz
    zhangskz authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    571fae4 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Update upb dep to the latest 23.x commit (#13215) 

    * Update upb dep to the latest 23.x commit

* Fix objectivec test failure in Bazel 6+.

This fix works in Bazel 5 and 6, but the original `import pddm` only works in Bazel 5.  This is preventing our upgrade to Bazel 6 that will reduce our mac flakes in CI.

PiperOrigin-RevId: 543565397

* Bump heap size for linkage monitor tests
    @mkruskal-google
    mkruskal-google authored Jul 5, 2023
    Configuration menu
    Copy the full SHA
    da85a3a View commit details
    Browse the repository at this point in the history

  2. Updating version.json and repo version numbers to: 23.4

    @protobuf-team-bot
    protobuf-team-bot committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2c5fa07 View commit details
    Browse the repository at this point in the history
Loading