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

640 Commits

Author SHA1 Message Date
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051) 
* Update protobuf version

* Update PHP release notes in package.xml
 2021-10-04 17:43:33 -07:00
Joshua Haberman
82deebfa7a Added new Java Lite files to BUILD/pom.xml. 2021-09-28 22:25:19 +00:00
Josh Haberman
129b3e8a98 Merge branch 'master' into sync-stage 2021-09-28 15:28:48 +00:00
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release 
Merge 3.18.x release branch to master
 2021-09-27 17:55:39 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Josh Haberman
624d29d833 Sync from Piper @399250367 
PROTOBUF_SYNC_PIPER
 2021-09-27 19:18:41 +00:00
Elliotte Rusty Harold
a93074e546
deps: add j2objc annotations (#9005) 
* deps: add j2objc annotations

@pzd this will be needed on the next sync with google3
 2021-09-22 12:41:03 +00:00
Elliotte Rusty Harold
06cfc9a0e6
docs: 3.18.0 is released 2021-09-20 16:17:31 -04:00
zhangskz
0fe47f3971
Merge branch 'master' into sync-stage 2021-09-13 15:21:57 -07:00
Sandy Zhang
e56c930d39 Fix map_test.proto package name 2021-09-13 22:18:07 +00:00
Elliotte Rusty Harold
5f55fe1d6b
enforce android API level 14 (#8971) 
* enforce android API level 14
Add animal-sniffer plugin to check for android compatibility

* Revert "Merge pull request #7855 from belugabehr/ObjectsRequireNonNull"

This reverts commit a3e5587447, reversing
changes made to f79f956b74.
 2021-09-13 15:49:00 -04:00
Paul Yang
12fb2b7450
Update protobuf version (#8973) 
* Update protobuf version

* Update php notes
 2021-09-13 12:34:03 -07:00
Sandy Zhang
6dd2176354 Sync from Piper @396393195 
PROTOBUF_SYNC_PIPER
 2021-09-13 17:56:05 +00:00
Sandy Zhang
215dd1335b Sync from Piper @395989630 
PROTOBUF_SYNC_PIPER
 2021-09-10 20:04:52 +00:00
Joshua Haberman
b6d1e05d55 Removed google-internal annotation. 2021-09-09 10:06:21 -07:00
Joshua Haberman
4a81770b7f Reverted package change in test proto. 2021-09-09 10:01:41 -07:00
Joshua Haberman
018e2e7751 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/descriptor.pb.cc
#	src/google/protobuf/duration.pb.cc
#	src/google/protobuf/timestamp.pb.cc
#	src/google/protobuf/type.pb.cc
#	src/google/protobuf/wrappers.pb.cc
 2021-09-09 08:23:12 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834 
PROTOBUF_SYNC_PIPER
 2021-09-09 08:21:42 -07:00
Derek Perez
0bab8e808e Addresses duplicates identified in #8925 (#8939) 
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
 2021-08-31 12:19:03 -07:00
Derek Perez
2937b2ca63
Addresses duplicates identified in #8925 (#8939) 
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
 2021-08-31 12:14:11 -07:00
Elliotte Rusty Harold
a3e5587447
Merge pull request #7855 from belugabehr/ObjectsRequireNonNull 
Standardize NPE checks on JDK Objects utility
 2021-08-29 12:43:27 +00:00
Bo Yang
d8f55782b0 Update protobuf version 2021-08-27 14:39:58 -07:00
Elliotte Rusty Harold
8cf990fc9f
Updtae version to 3.17.3 (#8889) 2021-08-26 09:12:56 -07:00
Adam Cozzette
f78fefc1ff Sync from Piper @392954264 
PROTOBUF_SYNC_PIPER
 2021-08-25 12:32:02 -07:00
Adam Cozzette
4eed0dab5a Sync from Piper @392076391 
PROTOBUF_SYNC_PIPER
 2021-08-20 15:05:53 -07:00
Paul Yang
7cbc08615f
Update protobuf version (#8887) 2021-08-18 17:20:20 -07:00
Bo Yang
04fc93f4b5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-18 09:25:50 -07:00
Bo Yang
509aee4b8b Sync from Piper @391414001 
PROTOBUF_SYNC_PIPER
 2021-08-17 17:26:34 -07:00
Adam Cozzette
0773db2124 Fix Kotlin tests 2021-08-06 09:59:14 -07:00
Adam Cozzette
6cee7c604e Temporarily disable ExtensionRegistryFactoryTest 2021-08-04 14:34:53 -07:00
Adam Cozzette
d46abc1e7e Update BUILD and cmake files and add some missing Java dependencies 2021-08-03 13:44:26 -07:00
Adam Cozzette
5d03f8c8a5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-03 12:25:42 -07:00
Adam Cozzette
562fc946c7 Sync from Piper @388508285 
PROTOBUF_SYNC_PIPER
 2021-08-03 11:58:05 -07:00
Damon Cai
a420f23d4c
Remove JvmField annotations from Kotlin private properties (#8804) (#8811) 2021-07-13 15:25:00 -07:00
Derek Perez
c684434ecb
creating a single target to rollup maven artifacts (#8776) 2021-06-28 14:38:25 -07:00
deannagarcia
611a08ee00
Merge pull request #8752 from deannagarcia/rulesJvmExternal 
Create java_export targets
 2021-06-25 13:49:30 -07:00
Derek Perez
9276968326
Detect Windows vs Non-Windows execution context in tests. (#8767) 2021-06-25 12:55:11 -07:00
Derek Perez
2ea5c9951c
Fix for WIndows Bazel CI (#8761) 2021-06-24 10:58:39 -07:00
Derek Perez
91bbdc90e3
Ensure testdata text always uses \n newlines. (#8756) 2021-06-22 11:48:33 -07:00
Deanna Garcia
1f1ed9c62f Changing one more instance of VERSION 2021-06-21 23:07:29 +00:00
Deanna Garcia
96cffb3ac3 Removing dependencies and renaming bazel version file 2021-06-21 23:03:51 +00:00
Deanna Garcia
89a9f459e9 Changing BUILD files and adding pom templates 2021-06-21 22:28:17 +00:00
Derek Perez
9d9d8ee18d
Removing deprecated TimeUtil class. (#8749) 2021-06-18 12:30:27 -07:00
deannagarcia
09588d44b0
Update pom.xml 2021-06-10 11:20:28 -04:00
deannagarcia
ab229be611
Merge pull request #8709 from protocolbuffers/3.17.x 
Merge 3.17.x into master
 2021-06-09 11:57:34 -04:00
Stanislav Kashirin
37b18c5f12
Remove unnecessary allocation during String field emptiness checks (#7526) 2021-06-08 16:48:00 -04:00
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