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
Deanna Garcia
1456462a14
Add java8 tests and build flags
2 years ago
Jerry Berg
a2e33e79e9
Java fixes for 22.x ( #12035 )
...
* Fix mutability bug in Java proto lite: sub-messages inside of oneofs were not
being set as immutable. This would allow code to get a builder for a
sub-message and modify the original (supposedly immutable) copy.
PiperOrigin-RevId: 511598810
* Add casts to make protobuf compatible with Java 1.8 runtime.
Fix for: https://github.com/protocolbuffers/protobuf/issues/11393
PiperOrigin-RevId: 511807920
---------
Co-authored-by: Protobuf Team Bot <protobuf-github-bot@google.com>
2 years ago
Adam Cozzette
fac76b35bd
Merge pull request #12043 from acozzette/cherry-pick-fix-for-11996
...
Ensure VarintParseSlowArm{32,64} are exported with PROTOBUF_EXPORT
2 years ago
Adam Cozzette
f02f8279ce
Ensure VarintParseSlowArm{32,64} are exported with PROTOBUF_EXPORT
...
This should fix issue #11996 .
PiperOrigin-RevId: 511917449
2 years ago
deannagarcia
701aa55fc3
Merge pull request #12030 from deannagarcia/osgi
...
Add OSGi headers to pom files.
2 years ago
zhangskz
7aad6f887a
Merge pull request #12008 from protocolbuffers/zhangskz-patch-2
...
Allow empty commits for update_php_repo
2 years ago
Deanna Garcia
e909bfc517
Add OSGi headers to pom files.
...
This addresses https://github.com/protocolbuffers/protobuf/issues/12017 .
PiperOrigin-RevId: 511587640
2 years ago
deannagarcia
9ee7b565c2
Fix pom_template dependencies. All pom files need a dependency section and kotlin + util need to depend on protobuf-java and kotlin-lite should depend on protobuf-javalite. ( #12009 )
...
This fixes https://github.com/protocolbuffers/protobuf/issues/11976
PiperOrigin-RevId: 511252224
2 years ago
zhangskz
21a5e8dffe
Allow empty commits for update_php_repo
...
Fix exit code on git commit which was preventing force-push and tagging from running even though these should work without a new commit. An empty commit is probably clearer anyways to show that sync has happened.
2 years ago
deannagarcia
20c15bb5dd
Merge pull request #11992 from protocolbuffers/deannagarcia-patch-2
...
Add plugin.proto to the list of well known files for python
2 years ago
deannagarcia
ba5f374a6c
Merge pull request #11991 from protocolbuffers/deannagarcia-patch-1
...
Strip "src" from file name of plugin.proto
2 years ago
deannagarcia
620d21a8ac
Add visibility of plugin.proto to python directory
2 years ago
deannagarcia
56c149863c
Depend on proto file instead of proto library
2 years ago
deannagarcia
aece606096
Add forward slash
2 years ago
deannagarcia
491d27e4e6
Add plugin.proto to the list of well known files for python
...
In 21.x, depending on "//python:well_known_types_py_pb2" provided a transitive dependency to `compiler/plugin.proto`. That dependency was incorrectly removed for 22.x.
2 years ago