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

593 Commits

Author SHA1 Message Date
Deanna Garcia
367851d124 Update protobuf version 2021-06-04 21:21:39 +00:00
Deanna Garcia
0717715ae9 Removing more from the pom 2021-06-04 21:14:15 +00:00
Deanna Garcia
5330d0d5da Updating pom files 2021-06-04 20:47:49 +00:00
deannagarcia
f5a0e3988b
Merge branch 'master' into 3.17.x 2021-06-04 17:22:24 +00:00
Elliotte Rusty Harold
7a374d4a2f
deps: update to Guava 30.1.1 (#8521) 
@eklitzke
 2021-06-03 10:40:17 -07:00
Paul Yang
548e01324e
Merge pull request #8689 from deannagarcia/merge3.17.2 
Merge 3.17.x into master
 2021-06-03 10:39:39 -07:00
Deanna Garcia
50a317556a Fixing merge conflict 2021-06-02 22:31:51 +00:00
Deanna Garcia
506f2273d1 Merging 3.17.x branch into master 2021-06-02 22:29:40 +00:00
Deanna Garcia
7090f7ab55 Adding dokka to main pom 2021-06-01 23:04:16 +00:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage 
Integrate from Piper for C++, Java, and Python
 2021-06-01 15:20:53 -07:00
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x 
Merge 3.17.x into master
 2021-05-27 08:05:54 -07:00
Deanna Garcia
5b8208ecea Update protobuf version 2021-05-25 19:36:05 +00:00
Deanna Garcia
021329b7e7 resolving conflicts 2021-05-25 17:27:07 +00:00
Joshua Haberman
a8d8eb17df Merge tag 'refs/tags/sync-piper' into sync-stage 2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932 
PROTOBUF_SYNC_PIPER
 2021-05-24 13:49:39 -07:00
Adam Cozzette
b506c31de0 Merge branch '3.17.x' into merge-3.17.x 2021-05-24 12:24:38 -07:00
Adam Cozzette
52784ced2f
Update protobuf version (#8633) 2021-05-19 16:43:44 -07:00
deannagarcia
d1098000ce
Merge branch 'master' into sync-stage 2021-05-18 13:48:32 -07:00
Dennis Shao
3b5f123537
Update pom.xml 2021-05-17 16:57:04 -05:00
Dennis Shao
ecbdbbaaf0
Merge branch 'master' into kotlin-gen-docs 2021-05-17 16:52:39 -05:00
Dennis Shao
31d3098af6
Update pom.xml 
Add plugin to generate Kotlin docs
 2021-05-17 16:51:42 -05:00
David L. Jones
24935638ea
Revert "Merge branch 'kotlin' into master" (#8622) 
This reverts commit 716621a222, reversing
changes made to f0da89d8b6.
 2021-05-17 14:26:10 -07:00
Dennis Shao
716621a222
Merge branch 'kotlin' into master 2021-05-17 15:58:53 -05:00
Dennis Shao
45aca8d7a0 Update pom.xml for kotlin doc generateor 2021-05-17 20:56:02 +00:00
Deanna Garcia
6da55b2d6b Add changes to CHANGES.txt 2021-05-14 22:20:48 +00:00
Deanna Garcia
f66dea481d Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
 2021-05-14 21:56:03 +00:00
Deanna Garcia
094d18944e Sync from Piper @373871284 
PROTOBUF_SYNC_PIPER
 2021-05-14 21:55:47 +00:00
Deanna Garcia
380e352b0b Sync from Piper @373820256 
PROTOBUF_SYNC_PIPER
 2021-05-14 17:50:31 +00:00
Deanna Garcia
a36efdefa3 Merge branch 'master' into updateKotlinCompiler 2021-05-13 22:47:03 +00:00
Adam Cozzette
652d99a8ee
Update protobuf version (#8606) 2021-05-12 16:20:18 -07:00
Deanna Garcia
92e504e660 Merge remote-tracking branch 'upstream/master' into updateKotlinCompiler 2021-05-12 21:58:09 +00:00
Deanna Garcia
4a5e765fe3 Adding more repeated extension tests 2021-05-12 17:50:59 +00:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 (#8586) 
* Update protobuf version

* Updated Kotlin versions and updated script to handle them
 2021-05-10 15:31:35 -07:00
Deanna Garcia
cf234cf132 Updating Kotlin compiler version and testing new functionality it allows 2021-05-10 22:11:04 +00:00
Adam Cozzette
3546d29a00
Add the kotlin and kotlin-lite directories to the main pom.xml (#8585) 
* Add the kotlin and kotlin-lite directories to the main pom.xml

* Updated Kotlin versions to 3.17.0-rc1

* Fix Mac CI tests by resolving brew package conflict
 2021-05-10 13:36:33 -07:00
Adam Cozzette
7025f37cde
Update protobuf version (#8575) 2021-05-07 09:51:15 -07:00
Joshua Haberman
535ddf1c4f Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-30 16:12:51 -07:00
Joshua Haberman
f5fd897c1d Sync from Piper @371422642 
PROTOBUF_SYNC_PIPER
 2021-04-30 16:12:50 -07:00
deannagarcia
76188afb94
Merge pull request #8272 from deannagarcia/kotlinProtos 
Opensourcing kotlin protos
 2021-04-21 10:29:26 -07:00
Derek Perez
bc45f92262
Bazel powered Java testing (#8506) 
* Protobuf Java/Core Tests running w/ Bazel.

Also integrates rules_jvm_external and migrates existing maven deps
in place.

* Add test_suite target that maps to rule name.

* Lite tests passing in Bazel

* util tests passing with Bazel.

* Add conformance and build testing to //java:core

* Cleanup bzl style and lock down access to failure lists.

* Adding Java Lite conformance tests.

* rm newline

* parameterize conformance_test

This makes usage of failure lists more explicit.

* restrict visibility more for newly added libs and fix formatting.

* fix formatting and visibility.

* move testing.bzl to an internal package.

* fix file formatting.

* moving conformance_test to internal.bzl
 2021-04-20 11:36:32 -07:00
Derek Perez
d1b2eff440
Cleanup kokoro usages of java_compatibility and eliminate java/compatibility_tests. (#8504) 2021-04-20 09:36:06 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Deanna Garcia
f6508077db Adding note to the README about kotlin protos 2021-04-15 16:39:18 +00:00
Deanna Garcia
1b637aad33 Merge branch 'kotlinProtos' of https://github.com/deannagarcia/protobuf into kotlinProtos 2021-04-12 22:28:06 +00:00
Deanna Garcia
a250d3f8d8 Restrict extension setter and getter operations to non-nullable T 2021-04-12 22:25:20 +00:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Tobias Liese
1db2b662de
Fixed version for gradle in java Readme.md 
Looks like this was forgotten by the last time this was edited.
 2021-04-08 10:48:22 +02:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463) 
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
 2021-04-07 15:38:38 -07:00
deannagarcia
e844a53716
Merge branch 'master' into kotlinProtos 2021-04-06 10:18:13 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
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