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
base: v3.25.2
Choose a base ref
...
head repository: protocolbuffers/protobuf
compare: v3.25.3
Choose a head ref
  • 14 commits
  • 43 files changed
  • 6 contributors

Commits on Jan 8, 2024

  1. Configuration menu
    Copy the full SHA
    fc222b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Pin bundler version to 2.4.22 for Ruby 2.7 support.

    Latest bundler 2.5.0 release results in the following error: `The last version of bundler (>= 0) to support your Ruby & RubyGems was 2.4.22. Try installing it with gem install bundler -v 2.4.22 bundler requires Ruby version >= 3.0.0. The current ruby version is 2.7.3.183.`
    
    PiperOrigin-RevId: 591288515
    zhangskz committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    80b4586 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6766d85 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Merge pull request #15360 from protocolbuffers/backport-bundler

    Pin bundler version to 2.4.22 for Ruby 2.7 support.
    zhangskz committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    971fbf6 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. remove use of mach_absolute_time (#15554)

    `mach_absolute_time` is one of Apple's required reason APIs (https://developer.apple.com/documentation/kernel/1462446-mach_absolute_time?language=objc). Replace it with the suggested `clock_gettime_nsec_np(CLOCK_UPTIME_RAW)` so that we don't need a RRA entry in a privacy manifest.
    
    issue #15029
    
    Closes #15554
    
    COPYBARA_INTEGRATE_REVIEW=#15554 from protocolbuffers:dmaclach-mach_absolute_time 295d831
    PiperOrigin-RevId: 601370915
    dmaclach authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    76d05d4 View commit details
    Browse the repository at this point in the history
  2. Add PrivacyInfo.xcprivacy (#15557)

    issue##15029
    
    As required by https://developer.apple.com/support/third-party-SDK-requirements/
    
    Protos does not collect data.
    
    Required reason APIs searched for using:
    ```
    grep -ER 'NSFileCreationDate|NSFileModificationDate|fileModificationDate|NSURLContentModificationDateKey|NSURLCreationDateKey|getattrlist\(|getattrlistbulk\(|fgetattrlist\(|stat\(|fstat\(|fstatat\(|lstat\(|getattrlistat\(|systemUptime\(|mach_absolute_time\(|NSURLVolumeAvailableCapacityKey|NSURLVolumeAvailableCapacityForImportantUsageKey|NSURLVolumeAvailableCapacityForOpportunisticUsageKey|NSURLVolumeTotalCapacityKey|NSFileSystemFreeSize|NSFileSystemSize|statfs\(|statvfs\(|fstatfs\(|fstatvfs\(|getattrlist\(|fgetattrlist\(|getattrlistat\(|activeInputModes|NSUserDefaults' .
    ```
    
    ```
    ./third_party/utf8_range/utf8_to_utf16/main.c:    if (fstat(fd, &stat) == -1) {
    ./third_party/utf8_range/main.c:    if (fstat(fd, &stat) == -1) {
    ./src/google/protobuf/map.h:    s = mach_absolute_time();
    ./src/google/protobuf/io/io_win32.cc:int stat(const char* path, struct _stat* buffer) {
    ./src/google/protobuf/io/io_win32.cc:  return ::_wstat(wpath.c_str(), buffer);
    ./src/google/protobuf/io/io_win32.cc:  return ::_stat(path, buffer);
    ./src/google/protobuf/io/io_win32.h:PROTOBUF_EXPORT int stat(const char* path, struct _stat* buffer);
    ./src/google/protobuf/testing/file.cc:  if (lstat(name.c_str(), &stats) != 0) return;
    ./src/google/protobuf/compiler/importer.cc:    ret = stat(std::string(filename).c_str(), &sb);
    ```
    
    `./third_party/utf8_range/...` - tool for utf that is not in user binaries
    `./src/google/protobuf/map.h` - resolved with pull#15554
    `./src/google/protobuf/io/io_win32.cc` - windows code
    `./src/google/protobuf/testing/file.cc` - testing code not in user binaries
    `./src/google/protobuf/compiler/importer.cc` - compiler code not in user binaries
    
    So no required reason APIs.
    
    Apple has not yet communicated how this is to be put into podspecs so saving for future commit.
    
    Closes #15557
    
    COPYBARA_INTEGRATE_REVIEW=#15557 from dmaclach:privacy 4c4e570
    PiperOrigin-RevId: 601362376
    dmaclach authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    cf87faa View commit details
    Browse the repository at this point in the history
  3. [ObjC] Add the privacy manifest to the ObjC CocoaPod.

    There are no restrict calls, so the manifest asserts that.
    
    The CocoaPods support now ensure you are using CocoaPods >= 1.12 as that
    avoids all the know bugs in CocoaPods support needed to capture the
    Privacy Manifest in a resource bundle.
    
    PiperOrigin-RevId: 602433417
    thomasvl authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    cec08dc View commit details
    Browse the repository at this point in the history
  4. [CPP] Add the privacy manifest to the C++ CocoaPod.

    There are no restrict calls, so the manifest asserts that.
    
    The CocoaPods support now ensures you are using CocoaPods >= 1.12 as that
    avoids all the know bugs in CocoaPods support needed to capture the
    Privacy Manifest in a resource bundle.
    
    PiperOrigin-RevId: 602443703
    thomasvl authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    9d1bc10 View commit details
    Browse the repository at this point in the history
  5. [ObjC] Use a local to avoid warnings in 32bit builds.

    CocoaPods fails spec validation for some warnings, so use a local
    to avoid warnings for 64->32bit implicit conversions. This comes up
    for watchOS builds.
    
    PiperOrigin-RevId: 601849919
    thomasvl authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    9dc736d View commit details
    Browse the repository at this point in the history
  6. Bump python version to 3.9 for gcloud 460.0.0

    PiperOrigin-RevId: 599953322
    mkruskal-google authored and zhangskz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    17ec19d View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge pull request #15802 from protocolbuffers/cp-25.x

    Cherrypick Apple Privacy Manifest changes to make these available in 25.x
    zhangskz committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    70e459f View commit details
    Browse the repository at this point in the history
  2. Update Ruby GHA to test against Ruby 3.3.

    Fixes #15182
    
    PiperOrigin-RevId: 593899707
    zhangskz committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    25b1e81 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #15814 from protocolbuffers/cp-ruby-3.3

    Update Ruby GHA to test against Ruby 3.3.
    zhangskz committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    7c6ba83 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Configuration menu
    Copy the full SHA
    4a2aef5 View commit details
    Browse the repository at this point in the history