Joshua Haberman
33905ec87b
Fixed the Java Lite build.
2021-03-03 12:36:13 -08:00
Joshua Haberman
f645c7ed07
Fixed spelling errors surfaced by CodeSpell.
2021-02-26 10:54:13 -08:00
Joshua Haberman
9df42757f9
Sync from Piper @359788468
...
PROTOBUF_SYNC_PIPER
2021-02-26 10:37:37 -08:00
Adam Cozzette
d8254a67ce
Merge branch '3.15.x' into 3.15.x-202102231541
2021-02-23 15:51:34 -08:00
Adam Cozzette
d7e943b8d2
Update protobuf version
2021-02-23 13:21:42 -08:00
Adam Cozzette
6e84adc9ff
Merge branch '3.15.x' into merge-3-15-x
2021-02-22 11:03:32 -08:00
Adam Cozzette
052dc799d2
Update protobuf version
2021-02-19 15:12:24 -08:00
Adam Cozzette
133e5e7526
Update protobuf version
2021-02-18 16:53:24 -08:00
Adam Cozzette
de701c660b
Update protobuf version
2021-02-18 16:53:24 -08:00
Adam Cozzette
ac9218c5d9
Update protobuf version
2021-02-18 16:53:24 -08:00
Adam Cozzette
ae50d9b990
Update protobuf version
2021-02-18 11:50:15 -08:00
Adam Cozzette
8260126500
Update protobuf version
2021-02-17 10:51:33 -08:00
Elliotte Rusty Harold
e1b26fe4a1
deps: update to Guava 30.1 ( #8209 )
...
This release includes a minor security fix.
2021-02-11 16:28:10 -08:00
Adam Cozzette
e9f2ef308c
Update protobuf version
2021-02-05 15:37:10 -08:00
Joshua Haberman
51daaba638
Sync from Piper @355707933
...
PROTOBUF_SYNC_PIPER
2021-02-04 14:09:49 -08:00
Deanna Garcia
a00125024e
Sync from Piper @353127564
...
PROTOBUF_SYNC_PIPER
2021-01-22 00:24:30 +00:00
Elliotte Rusty Harold
c17e3c134c
Guava 30 ( #7991 )
2020-12-04 13:51:39 -08:00
Joshua Haberman
5c028d6cf4
Sync from Piper @343521567
...
PROTOBUF_SYNC_PIPER
2020-11-20 10:44:58 -08:00
Joshua Haberman
b70695dd68
Sync from Piper @338707351
...
PROTOBUF_SYNC_PIPER
2020-10-23 11:07:04 -07:00
Joshua Haberman
de371235c9
Sync from Piper @338284531
...
PROTOBUF_SYNC_PIPER
2020-10-21 10:04:14 -07:00
Joshua Haberman
38d6de1eef
Sync from Piper @334206209
...
PROTOBUF_SYNC_PIPER
2020-09-28 11:54:54 -07:00
Joshua Haberman
f3cf99c0fb
Sync from Piper @328224070
...
PROTOBUF_SYNC_PIPER
2020-08-24 15:48:43 -07:00
Joshua Haberman
32a94ce353
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# csharp/src/Google.Protobuf.Test/testprotos.pb
2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474
Sync from Piper @327110949
...
PROTOBUF_SYNC_PIPER
2020-08-17 15:26:13 -07:00
Adam Cozzette
58f4260e8e
Merged 3.13.x into master
2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358
Update protobuf version
2020-08-14 15:20:53 -07:00
Adam Cozzette
98c2e69f8c
Update protobuf version
2020-08-12 14:49:20 -07:00
Brendan Linn
389bd06d0a
//:protobuf_java_util: discontinue JDK 7 compatibility support.
...
6bbd56dfd9
removed the -source 7 -target
7 javacopts from the //java:{core,lite} targets in order to improve
compatibility with more recent versions of javac. (see that commit for
more discussion of motivation.) but the commit left -source 7 -target
7 javacopts on the related //java/util target. i've confirmed with the
commit author that this was just an oversight, so remove these flags
as well.
2020-08-11 16:25:41 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors ( #7751 )
...
* Fix a typo
* Fix lots of spelling errors
* Fix a few more spelling mistakes
* s/parsable/parseable/
* Don't touch the third party files
* Cloneable is the preferred C# term
* Copyable is the preferred C++ term
* Revert "s/parsable/parseable/"
This reverts commit 534ecf7675
.
* Revert unparseable->unparsable corrections
2020-08-10 11:08:25 -07:00
Roberto Cosenza
02ade8bc32
Adding forgotten duration.proto to the lite library
2020-08-07 14:44:49 -07:00
Adam Cozzette
1c587a8059
Updated version to 3.13.0-rc2
2020-08-07 14:44:49 -07:00
Adam Cozzette
6b3a834f33
Temporarily disabled ExtensionRegistryFactoryTest
...
This test has started failing, and I believe the cause is a change in
class loading behavior in Java 11. As far as I know, that breaks the
test logic but there is nothing wrong with the non-test code. This
change temporarily disables the test so that we can unblock the 4.0
release while I work on a more permanent fix.
2020-08-07 14:44:49 -07:00
Adam Cozzette
8940150706
Updated version to 3.13.0-rc1.
2020-08-07 14:44:49 -07:00
Roberto Cosenza
8c91d71f69
Adding forgotten duration.proto to the lite library
2020-07-20 10:09:31 -07:00
Peter Newman
fc8e2e871d
Fix a typo
2020-07-20 09:02:36 -07:00
Joshua Haberman
f77065d4eb
Sync from Piper @316511779
...
PROTOBUF_SYNC_PIPER
2020-06-15 11:48:47 -07:00
Joshua Haberman
c077d949d8
Merge branch '3.12.x' into merge-312
2020-05-26 16:45:43 -07:00
Joshua Haberman
beeb621f50
Update protobuf version ( #7557 )
2020-05-26 15:46:39 -07:00
Joshua Haberman
0a737d8eb0
Sync from Piper @313142438
...
PROTOBUF_SYNC_PIPER
2020-05-26 00:26:15 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version ( #7535 )
2020-05-20 10:54:29 -07:00
Joshua Haberman
e90b71cdee
Update protobuf version
2020-05-15 13:28:07 -07:00
Joshua Haberman
7276738e79
Fixed bug in map key sorting for Java TextFormat. ( #7508 )
...
Fixes: https://github.com/protocolbuffers/protobuf/issues/7505
2020-05-14 17:04:20 -07:00
Joshua Haberman
6ed738305b
Sync from Piper @311396324
...
PROTOBUF_SYNC_PIPER
2020-05-13 13:46:15 -07:00
Joshua Haberman
f597a24627
Update protobuf version
2020-05-12 12:49:46 -07:00
Joshua Haberman
01e8c0fa34
Cherry-pick the fix to #7480 from #7485 .
2020-05-12 11:34:02 -07:00
Joshua Haberman
6b5fb807c0
Sync from Piper @310858019
...
PROTOBUF_SYNC_PIPER
2020-05-11 00:12:20 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. ( #7449 )
2020-04-30 15:34:10 -07:00
Joshua Haberman
32e5deb1ac
Sync from Piper @308829107
...
PROTOBUF_SYNC_PIPER
2020-04-28 08:40:38 -07:00
Joshua Haberman
bb30225f06
Sync from Piper @307316823
...
PROTOBUF_SYNC_PIPER
2020-04-19 18:01:44 -07:00
Joshua Haberman
c649397029
Set execute bit on files if and only if they begin with (#!). ( #7347 )
...
* Set execute bit on files if and only if they begin with (#!).
Git only tracks the 'x' (executable) bit on each file. Prior to this
CL, our files were a random mix of executable and non-executable.
This change imposes some order by making files executable if and only
if they have shebang (#!) lines at the beginning.
We don't have any executable binaries checked into the repo, so
we shouldn't need to worry about that case.
* Added fix_permissions.sh script to set +x iff a file begins with (#!).
2020-04-01 15:28:25 -07:00