aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-27Merge pull request #16332 from protocolbuffers/26.x-202403271956upstream-26.xMike Kruskal
Merge release commits to 26.x
2024-03-27Updating version.json and repo version numbers to: 26.2-devProtobuf Team Bot
2024-03-27Updating version.json and repo version numbers to: 26.1Protobuf Team Bot
2024-03-26Merge pull request #16308 from protocolbuffers/cp-26x-3zhangskz
Set label to REQUIRED for descriptors with LEGACY_REQUIRED feature.
2024-03-26Fix validateFeatures to be called after resolved features are actually set ↵Sandy Zhang
to this.features PiperOrigin-RevId: 619261163
2024-03-26Merge pull request #16307 from protocolbuffers/cp-26x-2zhangskz
Update protoc release to include editions language features protos fo…
2024-03-26Merge pull request #16309 from protocolbuffers/cp-26x-4zhangskz
Move java_features.proto to java/core/srce/main/resources
2024-03-25Cherry-pick required label handling in JRuby field descriptor from ↵Sandy Zhang
https://github.com/protocolbuffers/protobuf/commit/bca8fb6117cf24785edb238d96bffe2c3a6d7164
2024-03-25Update cmake stalenesSandy Zhang
2024-03-25Merge branch '26.x' into cp-26x-4zhangskz
2024-03-25Expand cpp_features_proto_srcs visibilitySandy Zhang
2024-03-25Merge pull request #16294 from protocolbuffers/cp-26xzhangskz
Cherry-pick changes 26.x
2024-03-25Move java_features.proto to java/core/srce/main/resourcesSandy Zhang
This also fixes maven to package this correctly as google/protobuf/java_features.proto (same dir as WKT/descriptor.proto) instead of com/google/protobuf/java_features.proto. Fixes https://github.com/protocolbuffers/protobuf/issues/16155 PiperOrigin-RevId: 617307475
2024-03-25Set label to REQUIRED for descriptors with LEGACY_REQUIRED feature.Sandy Zhang
Ensures isOptional() does not return true for LEGACY_REQUIRED fields which would otherwise get the optional label applied by default (non-optional fields still get the optional label). Adds validation to feature resolution instead of cross link, which is too early to have FieldPresence.LEGACY_REQUIRED resolved. PiperOrigin-RevId: 618857590
2024-03-25Update protoc release to include editions language features protos for Java ↵Sandy Zhang
and C++ Fixes https://github.com/protocolbuffers/protobuf/issues/16211 PiperOrigin-RevId: 618954029
2024-03-25Add java_features.proto to kotlin_mvn releaseSandy Zhang
PiperOrigin-RevId: 618295219
2024-03-22Fix Android platforms constraint (#16246) (#16271)Adam Cozzette
When using bazel platforms and new rules_android_ndk, crosstool_top is actually still `//external:android/crosstool`. The right way to detect Android is to use `constraint_value`. Closes #16246 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/16246 from sifmelcara:fix-platforms dbf3fd58dbfb3aca17831121c9e0681addc9aa21 PiperOrigin-RevId: 618198820 Co-authored-by: Ming-Chuan <10496191+sifmelcara@users.noreply.github.com>
2024-03-22Add back android config_setting that looks for //external:android/crosstool ↵Adam Cozzette
(#16127) (#16264) In https://github.com/protocolbuffers/protobuf/pull/15298 `"crosstool_top": "//external:android/crosstool"` was replaced with `"crosstool_top": "@platforms//os:android"`. This breaks users who have not migrated to https://bazel.build/concepts/platforms yet. Closes #16127 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/16127 from sifmelcara:add-back-legacy-crosstool-top c643235a3d4ff1fc0deaa9b440c288de1b099bcc PiperOrigin-RevId: 615449874 Co-authored-by: Ming-Chuan <wtvwtvwtv2008@gmail.com>
2024-03-20Merge pull request #16237 from protocolbuffers/windows-getenv-fixMike Kruskal
Fix windows-only issue in our compiler unittests.
2024-03-19Merge pull request #16236 from mkruskal-google/windows-genenv-fixMike Kruskal
Fix windows-only issue in our compiler unittests.
2024-03-19Downgrade our sanitized builds to ubuntu-20.Mike Kruskal
The latest github runner image of ubuntu-22 includes a kernel update that breaks the sanitizers we use in our docker images. Long-term, we'll likely need to upgrade the images to new sanitizers and clang. PiperOrigin-RevId: 616319042
2024-03-19Fix windows-only issue in our compiler unittests.Mike Kruskal
Closes https://github.com/protocolbuffers/protobuf/issues/16026 PiperOrigin-RevId: 617333656
2024-03-12Merge pull request #16131 from protocolbuffers/26.x-202403122011Mike Kruskal
26.x 202403122011
2024-03-12Updating version.json and repo version numbers to: 26.1-devProtobuf Team Bot
2024-03-12Updating version.json and repo version numbers to: 26.0Protobuf Team Bot
2024-03-11Merge pull request #16002 from protocolbuffers/26.x-202402282330zhangskz
26.x 202402282330
2024-03-06Merge pull request #16090 from protocolbuffers/cp-add-includezhangskz
Add <shellapi.h> include for CommandLineToArgvW
2024-03-06Add <shellapi.h> include for CommandLineToArgvWSandy Zhang
This should fix the following error: ``` third_party\protobuf\src\google\protobuf\compiler\main.cc(127): error C3861: 'CommandLineToArgvW': identifier not found ``` PiperOrigin-RevId: 613319460
2024-03-05Merge pull request #16052 from protocolbuffers/cp-610783483zhangskz
Resolve features directly in setProto instead of temporarily setting …
2024-03-05Resolve features directly in setProto instead of temporarily setting to null.Sandy Zhang
Avoid potential races with other threads reading features that do not share a lock while features are temporarily null. Special handling for proto1 mutable should not actually be needed, since setProto doesn't update dependency protos. PiperOrigin-RevId: 610783483
2024-02-27Merge pull request #15983 from mkruskal-google/staleness-fix-26Mike Kruskal
Actually fail if staleness fail
2024-02-27Add back error message unconditionallyMike Kruskal
2024-02-27Updating version.json and repo version numbers to: 26.0-devProtobuf Team Bot
2024-02-27Updating version.json and repo version numbers to: 26.0-rc3Protobuf Team Bot
2024-02-27Merge pull request #15980 from protocolbuffers/regen-upbJoshua Haberman
Updated amalgamations for PHP and Ruby.
2024-02-27Actually fail if staleness failMike Kruskal
PiperOrigin-RevId: 610833812
2024-02-27Disabled macOS 8.2, to match main.Joshua Haberman
2024-02-27Updated amalgamations for PHP and Ruby.Joshua Haberman
2024-02-20Merge pull request #15867 from protocolbuffers/cp-rustzhangskz
Remove rust proto libraries from the editions/BUILD file.
2024-02-16Merge pull request #15840 from protocolbuffers/cp-ruby-memsizezhangskz
Ruby implement memsize functions for native types (#10291)
2024-02-16Remove rust proto libraries from the editions/BUILD file.Protobuf Team Bot
PiperOrigin-RevId: 605397582
2024-02-14Ruby implement memsize functions for native types (#10291)Jean byroot Boussier
Fix: https://github.com/protocolbuffers/protobuf/issues/10280 This allows Ruby to report a more correct estimation of the memory used by these objects. It's useful when running memory profilers against applications. cc @zhangskz @haberman Closes #10291 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/10291 from casperisfine:ruby-sizes 9150795328267e69a0b8e241dda675402e5633e2 PiperOrigin-RevId: 606718632
2024-02-14Merge pull request #15843 from protocolbuffers/cp-cmakezhangskz
Cherry-pick fixes to install.cmake to escape regex special characters
2024-02-14Merge pull request #15839 from protocolbuffers/cp-objczhangskz
Moved ObjectCache into an internal module.
2024-02-14Fix CMake regex escaping.Sandy Zhang
CMake documentation (https://cmake.org/cmake/help/latest/command/string.html#regex-replace) indicates subexpressions are actually referenced via \1 not $1 in cmake. PiperOrigin-RevId: 606307156
2024-02-14Escape _from_dir in install.cmake for regex special characters (e.g. c++) ↵Sandy Zhang
before REGEX REPLACE. PiperOrigin-RevId: 605469982
2024-02-14Tweak BUILD setup to make the layering check change less disruptive (#15838)Adam Cozzette
We recently updated the codebase to comply with the Bazel layering check, which essentially requires any C++ header inclusion to be matched with a build dependency on a target providing that header. As part of that, I removed a handful of dependencies from the `//:protobuf` target, since these dependencies were not set up in a way that respected the layering check. However, I realized that this may cause a number of breakages, especially since we did not provide the correct public targets until very recently. This change effectively adds back in the missing dependencies, so that projects which do not yet adhere to the layering check can continue to depend on them indirectly. This way, we still adhere to the layering check and make it possible for projects that depend on us to do so, but in most cases we won't immediately break anyone. PiperOrigin-RevId: 607021111
2024-02-14Moved ObjectCache into an internal module.Joshua Haberman
This type has always been internal-only, but moving it to a module named `Internal` will make this clearer. PiperOrigin-RevId: 606649281
2024-02-08Add missing alias targets for C++ util libraries (#15783)Adam Cozzette
Until recently, these targets were dependencies of `//:protobuf` and could thus be accessed through that target. But now that we are adhering to the layering check, we need to provide proper access in a way that respects that check. This change uses top-level alias targets following the existing pattern. PiperOrigin-RevId: 605123979
2024-02-06Merge pull request #15748 from protocolbuffers/26.x-202402061854zhangskz
26.x 202402061854
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 14:06:20 +0000