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 |
|
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 |
|