Skip to content

Commit 345d5be

Browse files
authored
Merge pull request #36 from pubref/v0.7.1
Update deps and fix travis
2 parents 44c3928 + 05712be commit 345d5be

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ before_install:
2222
- CI_BASE="http://ci.bazel.io/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=$OS-$ARCH/lastSuccessfulBuild/artifact/output/ci"
2323
- CI_ARTIFACT="bazel--installer.sh"
2424
- URL="$GH_BASE/$GH_ARTIFACT"
25-
- if [[ "$V" == "HEAD" && "$OS" == "linux" ]]; then CI_ARTIFACT="`wget -qO- $CI_BASE | grep -oP 'bazel-.*?-installer.sh' | uniq`"; fi
26-
- if [[ "$V" == "HEAD" && "$OS" == "osx" ]]; then CI_ARTIFACT="`wget -qO- $CI_BASE | pcregrep -o 'bazel-.*?-installer.sh' | uniq`"; fi
25+
- if [[ "$V" == "HEAD" ]]; then CI_ARTIFACT="`wget -qO- $CI_BASE | grep -o 'bazel-[-_a-zA-Z0-9\.]*-installer.sh' | uniq`"; fi
2726
- if [[ "$V" == "HEAD" ]]; then URL="$CI_BASE/$CI_ARTIFACT"; fi
2827
- echo $URL
2928
- wget -O install.sh $URL

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ with +/- gRPC support on (osx, linux) :sparkles:.
88
[grpc_image]: https://github.com/pubref/rules_protobuf/blob/master/images/gRPC.png
99

1010
<table border="0"><tr>
11-
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/bazel.png" width="280"/></td>
12-
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/wtfcat.png" width="280"/></td>
13-
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/gRPC.png" width="280"/></td>
11+
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/bazel.png" width="190"/></td>
12+
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/wtfcat.png" width="190"/></td>
13+
<td><img src="https://github.com/pubref/rules_protobuf/blob/master/images/gRPC.png" width="190"/></td>
1414
</tr><tr>
1515
<td>Bazel</td>
1616
<td>rules_protobuf</td>
@@ -41,12 +41,12 @@ of this project are to:
4141

4242
| Language | Compile <sup>1</sup> | Build <sup>2</sup> | gRPC <sup>3</sup> |
4343
| ---------------------------: | -----------: | --------: | -------- |
44-
| [C++](cpp) | [cc_proto_compile](cpp#cc_proto_compile) | [cc_proto_library](cpp#cc_proto_library) | [v1.0.0<sup>673f</sup>](https://github.com/grpc/grpc/commit/673fa6c88b8abd542ae50c4480de92880a1e4777) |
44+
| [C++](cpp) | [cc_proto_compile](cpp#cc_proto_compile) | [cc_proto_library](cpp#cc_proto_library) | [v1.0.1](https://github.com/grpc/grpc/releases/tag/v1.0.1) |
4545
| [C#](csharp) | [csharp_proto_compile](csharp#csharp_proto_compile) | [csharp_proto_library](csharp#csharp_proto_library) | [1.0.0](https://www.nuget.org/packages/Grpc/) |
4646
| [Closure](closure) | [closure_proto_compile](js#closure_proto_compile) | [closure_proto_library](js#closure_proto_library) | |
47-
| [Go](go) | [go_proto_compile](go#go_proto_compile) | [go_proto_library](go#go_proto_library) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
48-
| [Go (gogo)](gogo) | [gogo_proto_compile](gogo#gogo_proto_compile) | [gogo_proto_library](gogo#gogo_proto_library) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
49-
| [gRPC gateway](grpc_gateway) | [grpc_gateway_proto_compile](grpc_gateway#grpc_gateway_proto_compile)<br/>[grpc_gateway_swagger_compile](grpc_gateway#grpc_gateway_swagger_compile) | [grpc_gateway_proto_library](grpc_gateway#grpc_gateway_proto_library)<br/>[grpc_gateway_binary](grpc_gateway#grpc_gateway_binary) | [v1.0.0](https://github.com/grpc/grpc-go/releases/tag/v1.0.0) |
47+
| [Go](go) | [go_proto_compile](go#go_proto_compile) | [go_proto_library](go#go_proto_library) | [v1.0.4](https://github.com/grpc/grpc-go/releases/tag/v1.0.4) |
48+
| [Go (gogo)](gogo) | [gogo_proto_compile](gogo#gogo_proto_compile) | [gogo_proto_library](gogo#gogo_proto_library) | [8d70fb](https://github.com/grpc/grpc-go/commit/8d70fb3182befc465c4a1eac8ad4d38ff49778e2) |
49+
| [gRPC gateway](grpc_gateway) | [grpc_gateway_proto_compile](grpc_gateway#grpc_gateway_proto_compile)<br/>[grpc_gateway_swagger_compile](grpc_gateway#grpc_gateway_swagger_compile) | [grpc_gateway_proto_library](grpc_gateway#grpc_gateway_proto_library)<br/>[grpc_gateway_binary](grpc_gateway#grpc_gateway_binary) | [v1.0.4](https://github.com/grpc/grpc-go/releases/tag/v1.0.4) |
5050
| [Java](java) | [java_proto_compile](java#java_proto_compile) | [java_proto_library](java#java_proto_library) | [v1.0.1](https://github.com/grpc/grpc-java/releases/tag/v1.0.1) |
5151
| [Node](node) | [node_proto_compile](js#node_proto_compile) | [node_proto_library](js#node_proto_library) | [1.0.0](https://www.npmjs.com/package/grpc) |
5252
| [Objective-C](objc) | [objc_proto_compile](objc#objc_proto_compile) | [objc_proto_library](objc#objc_proto_library) <sup>4</sup> | [v1.0.0<sup>673f</sup>](https://github.com/grpc/grpc/commit/673fa6c88b8abd542ae50c4480de92880a1e4777) |
@@ -90,7 +90,7 @@ language-specific `*_proto_repositories` rule(s):
9090
git_repository(
9191
name = "org_pubref_rules_protobuf",
9292
remote = "https://github.com/pubref/rules_protobuf",
93-
tag = "v0.7.0",
93+
tag = "v0.7.1",
9494
)
9595

9696
load("@org_pubref_rules_protobuf//java:rules.bzl", "java_proto_repositories")

cpp/deps.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ DEPS = {
55
"rule": "git_repository",
66
"remote": "https://github.com/grpc/grpc.git",
77
"init_submodules": True,
8-
"commit": "83f8bc5b807b717c2eb018fcb0874444843e25fb",
8+
"commit": "3808b6efe66b87269d43847bc113e94e2d3d28fb",
9+
#"tag": "v1.0.1",
910
},
1011

1112
# Hooray! The boringssl team provides a "master-with-bazel" branch
@@ -14,7 +15,7 @@ DEPS = {
1415
"boringssl": {
1516
"rule": "git_repository",
1617
"remote": "https://boringssl.googlesource.com/boringssl",
17-
"commit": "36b3ab3e5d3a4892444a698f7989f2150824d804", # Aug 3 2016
18+
"commit": "14443198abcfc48f0420011a636b220e58e18610", # Nov 11 2016
1819
},
1920

2021
# libssl is required for c++ grpc where it is expected in

examples/helloworld/java/org/pubref/rules_protobuf/examples/helloworld/client/HelloWorldClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.pubref.rules_protobuf.examples.helloworld.server.HelloWorldServer;
1616

1717
/**
18-
* A simple test that primarily checks that the client can compile.
18+
* A simple integration test that runs the server at startup.
1919
*/
2020
public class HelloWorldClientTest {
2121

gogo/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DEPS = {
33
"com_github_gogo_protobuf": {
44
"rule": "new_go_repository",
55
"importpath": "github.com/gogo/protobuf",
6-
"commit": "a11c89fbb0ad4acfa8abc4a4d5f7e27c477169b1",
6+
"commit": "8d70fb3182befc465c4a1eac8ad4d38ff49778e2", # Nov 5, 2016
77
},
88

99
}

java/deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ DEPS = {
4444

4545
"com_google_protobuf_protobuf_java": {
4646
"rule": "maven_jar",
47-
"artifact": "com.google.protobuf:protobuf-java:jar:3.0.0",
48-
"sha1": "6d325aa7c921661d84577c0a93d82da4df9fa4c8",
47+
"artifact": "com.google.protobuf:protobuf-java:jar:3.1.0",
48+
"sha1": "e13484d9da178399d32d2d27ee21a77cfb4b7873",
4949
},
5050

5151
"com_google_protobuf_protobuf_java_util": {
5252
"rule": "maven_jar",
53-
"artifact": "com.google.protobuf:protobuf-java-util:jar:3.0.0",
53+
"artifact": "com.google.protobuf:protobuf-java-util:jar:3.1.0",
5454
"sha1": "5c39485775c197fc1938e594dc358bfec1c188a0",
5555
},
5656

0 commit comments

Comments
 (0)