deannagarcia
21b4fd581f
Merge pull request #12453 from protocolbuffers/deannagarcia-patch-5
...
Fix .gitmodules to use the correct absl branch
2 years ago
deannagarcia
f51da1fe66
Fix .gitmodules to use the correct absl branch
2 years ago
Joshua Haberman
5ddb1fc609
Remove ODR violation from WKT codegen ( #12406 ) ( #12419 )
...
* Remove ODR violation from WKT codegen (#12406 )
Closes #12406
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12406 from mkruskal-google:wkt 1c6748e6aa
PiperOrigin-RevId: 522418175
* Removed legacy target.
---------
Co-authored-by: Mike Kruskal <mkruskal@google.com>
2 years ago
deannagarcia
f1c7820c9b
Suppress -Wunused-parameter warning for GCC and clang. ( #12355 )
...
* Suppress -Wunused-parameter warning for GCC and clang.
Closes https://github.com/protocolbuffers/protobuf/issues/12313
PiperOrigin-RevId: 520066451
* Remove unintended cherrypicked line
2 years ago
deannagarcia
58ecf38aa5
Merge pull request #12303 from protocolbuffers/deannagarcia-patch-4
...
Add codespell exceptions
2 years ago
deannagarcia
cb009b29fa
Merge pull request #12301 from mkruskal-google/cmake-fix
...
Only include utf8_range if it hasn't been included already
2 years ago
deannagarcia
6e624e4f6b
Add codespell exceptions
...
Codespell is failing on 22.x mostly because there were changes made to this file in main that weren't added to 22.x. This adds the extra exceptions.
2 years ago
Mike Kruskal
c4005f2c92
Only include utf8_range if it hasn't been included already
...
PiperOrigin-RevId: 518361290
2 years ago
Mike Kruskal
777df3d27e
Merge pull request #12276 from mkruskal-google/gtest-dep
...
Remove erroneous dependencies @com_google_googletest//:gtest and @com…
2 years ago
Preston Van Loon
27d2d2911d
Remove erroneous dependencies @com_google_googletest//:gtest and @com_google_googletest//:gtest_main from //src/google/protobuf/json:parser ( #12267 )
...
Downstream bazel projects that depend on protoc would need to provide googletest dependencies when it should not be necessary to do so.
Fixes #11409
Closes #12267
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12267 from prestonvanloon:remove-erroneous-googletest-dep 09fd163094
PiperOrigin-RevId: 517974450
2 years ago
zhangskz
787fc7ddba
Merge pull request #12199 from protocolbuffers/22.x-202303101751
...
22.x 202303101751
2 years ago
Protobuf Team Bot
653673916c
Updating version.json to: 22.3-dev
2 years ago
Protobuf Team Bot
81f89d509d
Updating version.json and repo version numbers to: 22.2
2 years ago
zhangskz
9540135894
Merge pull request #12194 from deannagarcia/finalPomFixes
...
Add version to intra proto dependencies and add kotlin stdlib dependency
2 years ago
Deanna Garcia
99ed01009f
Add version to intra proto dependencies and add kotlin stdlib dependency
2 years ago
deannagarcia
080e3067b9
Merge pull request #12189 from deannagarcia/poms
...
Add $ back for osgi header
2 years ago
Deanna Garcia
d80c12d322
Add $ back for osgi header
2 years ago
deannagarcia
be7f6b06c0
Merge pull request #12177 from deannagarcia/fixPom
...
Fix pom file errors caused by the extra "$"
2 years ago
Deanna Garcia
8ac2337595
Remove $ in pom files
2 years ago
deannagarcia
832a19627a
Merge pull request #12168 from protocolbuffers/22.x-202303072154
...
Update version numbers for 22.1 release
2 years ago
Protobuf Team Bot
9c02d4c0de
Updating version.json to: 22.2-dev
2 years ago
Protobuf Team Bot
839e8d25ea
Updating version.json and repo version numbers to: 22.1
2 years ago
deannagarcia
b869151779
Merge pull request #12165 from deannagarcia/fixWindowsExe
...
Condition executable name on build system
2 years ago
Deanna Garcia
5476b46af3
Condition executable name on build system
2 years ago
Mike Kruskal
b3733bfc74
Fix released protoc path
...
PiperOrigin-RevId: 514551233
2 years ago
Mike Kruskal
f6c0767a28
Rename protoc_static for release
...
PiperOrigin-RevId: 514500346
2 years ago
deannagarcia
3db15d3a82
Merge pull request #12152 from protocolbuffers/cherrypickStatic
...
Add release tests for statically linked binaries
2 years ago
Mike Kruskal
8a07f45293
Add release tests for statically linked binaries
...
For now, this only covers linux on the two architectures we have testing support for. However, it serves as a good sanity check and can be expanded in the future.
PiperOrigin-RevId: 514449399
2 years ago
deannagarcia
554bdb1360
Merge pull request #12113 from protocolbuffers/deannagarcia-patch-3
...
Fix toolchain resolution for osx x86_64
2 years ago
deannagarcia
3b727f84f2
Fix toolchain resolution for osx x86_64
2 years ago
deannagarcia
4c3d093ec6
Merge pull request #12109 from deannagarcia/cherrypickOSX
...
Cherrypick osx static linking fix
2 years ago
Mike Kruskal
964a7f0e05
Add libm linkage to toolchains
...
PiperOrigin-RevId: 513350744
2 years ago
Mike Kruskal
c9092fe0ed
Internal change
...
PiperOrigin-RevId: 513329841
2 years ago
deannagarcia
af7f9d52d6
Merge pull request #12099 from deannagarcia/updatedeps
...
Update UPB dep in preparation for 22.1
2 years ago
Deanna Garcia
f3bb8cb8d8
Add sha256 for upb
2 years ago
Deanna Garcia
46680103a7
Update UPB dep
2 years ago
deannagarcia
ec1a192689
Merge pull request #12097 from protocolbuffers/cherrypicks
...
Cherrypick fixes in preparation for 22.1
2 years ago
deannagarcia
3b49be20b5
Merge pull request #12096 from deannagarcia/cherrypicsk
...
Cherrypick changes in preparation for 22.1
2 years ago
Mike Kruskal
b143586425
Version protoc according to the compiler version number.
...
Previously we were using the C++ runtime version, which includes an extra major version number. See #12064
PiperOrigin-RevId: 513049588
2 years ago
Joshua Humphries
90623c7247
Fix trailing comment attribution when file has no final newline ( #12082 )
...
Fixes #12081 .
The issue was the call to `MaybeDetachComment`: the conditional assumed that there was a next token, which was on the same line as the previous one, making attribution unclear. However, if there is no next token, we should not detach.
The actual fix is a one-liner. The rest of this PR is updates to the tests to verify this behavior under a handful of scenarios.
Closes #12082
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12082 from jhump:jh/fix-trailing-comment-attribution 767e41cb05
PiperOrigin-RevId: 513046172
2 years ago
Mike Kruskal
8ad6cdd007
Modify release artifacts for protoc to statically link system libraries.
...
Closes #12063
PiperOrigin-RevId: 513034570
2 years ago
deannagarcia
5926dc4e46
Merge pull request #12085 from deannagarcia/errorpronekotlin
...
Remove errorprone dependency from kotlin protos.
2 years ago
Deanna Garcia
66f80c3610
Remove errorprone dependency from kotlin protos.
...
PiperOrigin-RevId: 512960332
2 years ago
deannagarcia
2bdf86d11f
Merge pull request #12055 from protocolbuffers/java8
...
Add java8 tests and build flags
2 years ago
deannagarcia
ae97c826f7
Fix potential null pointer error
2 years ago
deannagarcia
075677e415
Compare strings better
2 years ago
deannagarcia
5ffb29d684
Debug java version test
2 years ago
Deanna Garcia
27c7319106
Fix java version test
2 years ago
Deanna Garcia
c245167528
Fix docker image
2 years ago
Deanna Garcia
340d24ce8a
Add java opts file
2 years ago