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
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
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
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
b0acba39c9
cleaning up
2021-03-31 16:54:01 +00:00
Deanna Garcia
726241fca1
Changing structure to have kotlin submodules
2021-03-30 17:40:25 +00:00
