AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
8,375 Commits 35 Branches 138 Tags 124 MiB
1f1ed9c62f
Commit Graph

542 Commits

Author SHA1 Message Date
Deanna Garcia
50592a51ab Making dependency on java proto instead of copying files and generating kotlin generated code for standard protos 2021-04-02 21:45:41 +00:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Deanna Garcia
7b23ae1e66 Merge remote-tracking branch 'remotes/upstream/master' into kotlinProtos 2021-04-01 21:02:18 +00:00
Derek Perez
4008d229aa Sync from Piper @366297034 
PROTOBUF_SYNC_PIPER
 2021-04-01 18:49:52 +00:00
Deanna Garcia
74a32c02a1 fixing kokoro tests 2021-03-31 18:22:37 +00:00
Deanna Garcia
b0acba39c9 cleaning up 2021-03-31 16:54:01 +00:00
Deanna Garcia
30355ff78a Fixing build 2021-03-30 20:01:56 +00:00
Joshua Haberman
4a6dc34d3a Sync from Piper @365872496 
PROTOBUF_SYNC_PIPER
 2021-03-30 12:37:31 -07:00
Deanna Garcia
726241fca1 Changing structure to have kotlin submodules 2021-03-30 17:40:25 +00:00
Deanna Garcia
438d777e05 Adding file names to cmake files 2021-03-24 20:00:57 +00:00
deannagarcia
87faccd18e
Merge branch 'master' into kotlinProtos 2021-03-23 13:47:07 -07:00
Deanna Garcia
1949746e9c Commit with --kotlin_out working 2021-03-23 20:10:53 +00:00
Joshua Haberman
96307d28f6 Sync from Piper @364389596 
PROTOBUF_SYNC_PIPER
 2021-03-22 13:05:55 -07:00
Joshua Haberman
77334e39a7 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-03-22 13:05:55 -07:00
Deanna Garcia
751d05caf7 Fixing core ExtendableMessageExtension 2021-03-20 00:42:59 +00:00
Deanna Garcia
eef241890a Adding most recent work 2021-03-18 23:52:11 +00:00
Adam Cozzette
4c5465e5fe
Merge pull request #8402 from acozzette/merge-3-15-x 
Merge 3.15.x into master branch
 2021-03-16 11:01:34 -07:00
Adam Cozzette
4f8fef0a86
Merge pull request #8319 from elharo/patch-4 
deps: update JUnit and Truth
 2021-03-15 13:13:28 -07:00
Deanna Garcia
73e0e7af12 Removing target folder 2021-03-15 18:29:03 +00:00
Adam Cozzette
9db84d08fb Merge branch '3.15.x' into merge-3-15-x 2021-03-12 15:05:10 -08:00
Adam Cozzette
6aa539bf01 Update protobuf version 2021-03-10 14:53:26 -08:00
Deanna Garcia
be2f000c96 Adding most recent work 2021-03-10 00:24:57 +00:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x 2021-03-04 17:53:03 -08:00
Adam Cozzette
4fff47a418 Update protobuf version 2021-03-04 13:35:04 -08:00
Elliotte Rusty Harold
b6facc69ea docs: update version 2021-03-04 09:30:23 -08:00
Adam Cozzette
541b1735a8
Merge branch 'master' into 3.15.x-202103031418 2021-03-03 15:01:11 -08:00
Adam Cozzette
13fa25013a Merge branch '3.15.x' into 3.15.x-202103031418 2021-03-03 14:29:11 -08:00
Joshua Haberman
33905ec87b Fixed the Java Lite build. 2021-03-03 12:36:13 -08:00
Adam Cozzette
fd8aabf32d Update protobuf version 2021-03-03 11:37:48 -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
e54403190b Merge branch '3.15.x' into 3.15.x-202102251545 2021-02-25 15:54:09 -08:00
Adam Cozzette
983d115bd9 Update protobuf version 2021-02-25 09:20:20 -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
Elliotte Rusty Harold
947e2e189a
deps: update JUnit and Truth 2021-02-19 21:36:09 +00: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
Deanna Garcia
f25ca77c7f Make kotlin a top-level directory 2021-02-09 19:18:42 +00:00
Deanna Garcia
887462a435 Fixing some of the kokoro tests 2021-02-09 01:38:01 +00:00
Deanna Garcia
4f829fbecd Copying in kotlin proto specific files 2021-02-09 00:31:19 +00: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
Joshua Haberman
b99994d994 Sync from Piper @304070343 
PROTOBUF_SYNC_PIPER
 2020-03-31 16:25:37 -07:00
Rafi Kamal
0eb476b696 Merge branch 3.11.x to master 2020-02-18 16:42:47 -08:00
Yannic
f0cb9cdb95
[bazel] Move Java runtime/toolchains into //java (#7190) 
* [bazel] Move Java runtime/toolchains into //java

This change moves `java_library` targets from the top-level BUILD file
into `//java/{core,lite,util}` and declares `alias` targets to point to
their new locations (hence, this is not a breaking change).

This will allow users that don't use Java to stop depending on
`@rules_java` (e.g. as requested in
https://github.com/bazelbuild/rules_scala/pull/989#issuecomment-583405161).

Note that there is no intention to deprecate + remove the top-level
targets in the foreseeable future.

* Add BUILD files in //java to java_EXTRA_DIST
 2020-02-13 13:04:14 -08:00
Rafi Kamal
c74057267d
Update protobuf version (#7206) 2020-02-12 14:41:16 -08:00
Rafi Kamal
345df38dd3
Update protobuf version (#7143) 2020-01-31 13:47:09 -08:00
Elliotte Rusty Harold
47434eb43d
deps: update errorprone to 2.3.4 (#7125) (#7157) 2020-01-31 09:43:24 -08:00
Elliotte Rusty Harold
5e014c2ddf
Update JUnit and Truth (#7149) 2020-01-29 12:51:46 -08:00
Elliotte Rusty Harold
a62ee83401 deps: update errorprone to 2.3.4 (#7125) 
deps: update errorprone to 2.3.4
 2020-01-28 12:16:17 -08:00
Elliotte Rusty Harold
5a578d2a5c deps: update guava to 28.2-android 2020-01-10 10:52:48 -08:00
Rafi Kamal
ed8688de72
Merge pull request #7064 from rafi-kamal/3.11.x-202001071136 
Merge branch 3.11.x to master
 2020-01-08 12:24:20 -08:00
Brian Wignall
a104dffcb6 Fix typos (#7050) 
Uses https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines to find likely typos, with https://github.com/bwignall/typochecker to help automate the checking.
 2020-01-08 10:18:20 -08:00
Rafi Kamal
4500f31a6a Merge branch 3.11.x to master 2020-01-07 11:52:29 -08:00
Rafi Kamal
39492b68d8
Update protobuf version to 3.11.2 (#7004) 2019-12-10 17:50:28 -08:00
Elliotte Rusty Harold
4457b1f290 Update to 3.11.0 in docs 
@haberman
 2019-12-05 10:36:57 -08:00
Rafi Kamal
b78c53f935
Update protobuf version to 3.11.1 (#6972) 2019-12-02 11:57:21 -08:00
Rafi Kamal
1d5375c621
Update protobuf version to 3.11.0 (#6943) 2019-11-25 15:12:00 -08:00