diff options
Diffstat (limited to 'third_party')
18 files changed, 21 insertions, 37 deletions
diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD index 9693ea3d8e..25d2a5f407 100644 --- a/third_party/grpc/BUILD +++ b/third_party/grpc/BUILD @@ -9,22 +9,28 @@ filegroup( java_import( name = "grpc-jar", - jars = ["grpc-all-0.13.2.jar"], + jars = [ + "grpc-netty-0.14.1.jar", + "grpc-protobuf-0.14.1.jar", + "grpc-protobuf-lite-0.14.1.jar", + "grpc-stub-0.14.1.jar", + "grpc-core-0.14.1.jar", + ], runtime_deps = ["//third_party:netty"], ) filegroup( name = "grpc-java-plugin", srcs = select({ - "//third_party:windows_mingw": ["protoc-gen-grpc-java-0.13.2-windows-x86_32.exe"], - "//third_party:windows_msys64_mingw64": ["protoc-gen-grpc-java-0.13.2-windows-x86_64.exe"], - "//third_party:windows_msys64": ["protoc-gen-grpc-java-0.13.2-windows-x86_64.exe"], - "//third_party:windows_clang": ["protoc-gen-grpc-java-0.13.2-windows-x86_64.exe"], - "//third_party:darwin": ["protoc-gen-grpc-java-0.13.2-osx-x86_64.exe"], - "//third_party:k8": ["protoc-gen-grpc-java-0.13.2-linux-x86_64.exe"], - "//third_party:piii": ["protoc-gen-grpc-java-0.13.2-linux-x86_32.exe"], - "//third_party:arm": ["protoc-gen-grpc-java-0.13.2-linux-x86_32.exe"], - "//third_party:freebsd": ["protoc-gen-grpc-java-0.13.2-linux-x86_32.exe"], + "//third_party:windows_mingw": ["protoc-gen-grpc-java-0.14.1-windows-x86_32.exe"], + "//third_party:windows_msys64_mingw64": ["protoc-gen-grpc-java-0.14.1-windows-x86_64.exe"], + "//third_party:windows_msys64": ["protoc-gen-grpc-java-0.14.1-windows-x86_64.exe"], + "//third_party:windows_clang": ["protoc-gen-grpc-java-0.14.1-windows-x86_64.exe"], + "//third_party:darwin": ["protoc-gen-grpc-java-0.14.1-osx-x86_64.exe"], + "//third_party:k8": ["protoc-gen-grpc-java-0.14.1-linux-x86_64.exe"], + "//third_party:piii": ["protoc-gen-grpc-java-0.14.1-linux-x86_32.exe"], + "//third_party:arm": ["protoc-gen-grpc-java-0.14.1-linux-x86_32.exe"], + "//third_party:freebsd": ["protoc-gen-grpc-java-0.14.1-linux-x86_32.exe"], }), ) diff --git a/third_party/grpc/README.bazel.md b/third_party/grpc/README.bazel.md index 7631dd759c..dc4742636b 100644 --- a/third_party/grpc/README.bazel.md +++ b/third_party/grpc/README.bazel.md @@ -11,33 +11,11 @@ How to update the C++ sources of gRPC: How to update the Java plugin: -For any architecture other than 64-bit Linux, downloading it from Maven Central -is fine. For 64-bit Linux, the plugin needs to be built statically: - -1. `git clone http://github.com/grpc/grpc-java` -2. `git checkout <tag>` (current is `v0.13.2`, commithash `5933cea9`) -3. Modify the linker args in compiler/build.gradle according to the instructions below -4. Download the sources of protobuf (see `third_party/protobuf/README.md`) and compile it -5. `export LDFLAGS=<protobuf dir>/src/.libs` -6. `export CXXFLAGS=<protobuf dir>/src` -7. `cd compiler; ../gradlew java_pluginExecutable` - -In `compiler/build.gradle`, this list of linker arguments: - -``` - linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-static-libgcc", - "-static-libstdc++", - "-Wl,-Bdynamic", "-lpthread", "-s" -``` - -needs to be replaced with this: - -``` - linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-static-libgcc", - "-static-libstdc++", - "-lpthread", "-lc", "-s", "-static" -``` +Download it from Maven central. The project is called `protoc-gen-grpc-java` +and the version is `0.14.1` . How to update the Java code: -Simply download from Maven Central. +Download it from Maven central. The jars are called `grpc-core`, `grpc-netty`, +`grpc-protobuf`, `grpc-protobuf-lite`, `grpc-stub` and the version is +`0.14.`. diff --git a/third_party/grpc/grpc-all-0.13.2.jar b/third_party/grpc/grpc-all-0.13.2.jar Binary files differdeleted file mode 100644 index 71ed77edfc..0000000000 --- a/third_party/grpc/grpc-all-0.13.2.jar +++ /dev/null diff --git a/third_party/grpc/grpc-core-0.14.1.jar b/third_party/grpc/grpc-core-0.14.1.jar Binary files differnew file mode 100644 index 0000000000..75cc8fcc51 --- /dev/null +++ b/third_party/grpc/grpc-core-0.14.1.jar diff --git a/third_party/grpc/grpc-netty-0.14.1.jar b/third_party/grpc/grpc-netty-0.14.1.jar Binary files differnew file mode 100644 index 0000000000..31f493eb5e --- /dev/null +++ b/third_party/grpc/grpc-netty-0.14.1.jar diff --git a/third_party/grpc/grpc-protobuf-0.14.1.jar b/third_party/grpc/grpc-protobuf-0.14.1.jar Binary files differnew file mode 100644 index 0000000000..5566474c07 --- /dev/null +++ b/third_party/grpc/grpc-protobuf-0.14.1.jar diff --git a/third_party/grpc/grpc-protobuf-lite-0.14.1.jar b/third_party/grpc/grpc-protobuf-lite-0.14.1.jar Binary files differnew file mode 100644 index 0000000000..1b7938244a --- /dev/null +++ b/third_party/grpc/grpc-protobuf-lite-0.14.1.jar diff --git a/third_party/grpc/grpc-stub-0.14.1.jar b/third_party/grpc/grpc-stub-0.14.1.jar Binary files differnew file mode 100644 index 0000000000..c281b59b61 --- /dev/null +++ b/third_party/grpc/grpc-stub-0.14.1.jar diff --git a/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_32.exe b/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_32.exe Binary files differdeleted file mode 100755 index 9dbd553299..0000000000 --- a/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_32.exe +++ /dev/null diff --git a/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_64.exe Binary files differdeleted file mode 100755 index 93904a275f..0000000000 --- a/third_party/grpc/protoc-gen-grpc-java-0.13.2-linux-x86_64.exe +++ /dev/null diff --git a/third_party/grpc/protoc-gen-grpc-java-0.13.2-osx-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.13.2-osx-x86_64.exe Binary files differdeleted file mode 100755 index 6054fac631..0000000000 --- a/third_party/grpc/protoc-gen-grpc-java-0.13.2-osx-x86_64.exe +++ /dev/null diff --git a/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_32.exe b/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_32.exe Binary files differdeleted file mode 100755 index b03994b588..0000000000 --- a/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_32.exe +++ /dev/null diff --git a/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_64.exe Binary files differdeleted file mode 100755 index 5f720af6a7..0000000000 --- a/third_party/grpc/protoc-gen-grpc-java-0.13.2-windows-x86_64.exe +++ /dev/null diff --git a/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_32.exe b/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_32.exe Binary files differnew file mode 100755 index 0000000000..9cf43caf68 --- /dev/null +++ b/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_32.exe diff --git a/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_64.exe Binary files differnew file mode 100755 index 0000000000..93469d4753 --- /dev/null +++ b/third_party/grpc/protoc-gen-grpc-java-0.14.1-linux-x86_64.exe diff --git a/third_party/grpc/protoc-gen-grpc-java-0.14.1-osx-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.14.1-osx-x86_64.exe Binary files differnew file mode 100755 index 0000000000..fdade4c5d9 --- /dev/null +++ b/third_party/grpc/protoc-gen-grpc-java-0.14.1-osx-x86_64.exe diff --git a/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_32.exe b/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_32.exe Binary files differnew file mode 100644 index 0000000000..682a5bdd46 --- /dev/null +++ b/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_32.exe diff --git a/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_64.exe b/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_64.exe Binary files differnew file mode 100644 index 0000000000..b7352cecc2 --- /dev/null +++ b/third_party/grpc/protoc-gen-grpc-java-0.14.1-windows-x86_64.exe |