Adam Cozzette
4eed0dab5a
Sync from Piper @392076391
...
PROTOBUF_SYNC_PIPER
2021-08-20 15:05:53 -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
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
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
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
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 716621a222f0da89d8b6
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
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
Joshua Haberman
f5fd897c1d
Sync from Piper @371422642
...
PROTOBUF_SYNC_PIPER
2021-04-30 16:12:50 -07:00
Deanna Garcia
a250d3f8d8
Restrict extension setter and getter operations to non-nullable T
2021-04-12 22:25:20 +00: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
Deanna Garcia
74a32c02a1
fixing kokoro tests
2021-03-31 18:22:37 +00:00
Deanna Garcia
30355ff78a
Fixing build
2021-03-30 20:01:56 +00:00
Deanna Garcia
726241fca1
Changing structure to have kotlin submodules
2021-03-30 17:40:25 +00:00
